From 43d0dcbbd75411f03db3e2c3df430ddc747a0d14 Mon Sep 17 00:00:00 2001 From: Michael Hackstein Date: Wed, 2 May 2018 12:11:53 +0200 Subject: [PATCH] Bug fix/remove unnecessary cmake replace (#5242) * Bug fix 3.3/remove unnecessary cmake replace (#5233) * Removed superflous comment --- .gitignore | 3 -- CMakeLists.txt | 6 --- ...shell-database.js.in => shell-database.js} | 43 ------------------- 3 files changed, 52 deletions(-) rename js/common/tests/shell/{shell-database.js.in => shell-database.js} (86%) diff --git a/.gitignore b/.gitignore index 77f01beed3..200e5b7fbb 100644 --- a/.gitignore +++ b/.gitignore @@ -107,9 +107,6 @@ js/apps/system/_admin/aardvark/APP/frontend/build/libs.js.gz js/apps/system/_admin/aardvark/APP/frontend/build/style.css js/apps/system/_admin/aardvark/APP/frontend/build/scripts.html.part -# this is intentionally ignored, as the file is generated by -# shell-database.js.in -js/common/tests/shell/shell-database.js .gdb-history npm-debug.log diff --git a/CMakeLists.txt b/CMakeLists.txt index 87190b6e95..1bcbdf6bb5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -167,12 +167,6 @@ configure_file( NEWLINE_STYLE UNIX ) -configure_file( - "${CMAKE_CURRENT_SOURCE_DIR}/js/common/tests/shell/shell-database.js.in" - "${CMAKE_CURRENT_SOURCE_DIR}/js/common/tests/shell/shell-database.js" - NEWLINE_STYLE UNIX -) - ################################################################################ ## Find the git revision ################################################################################ diff --git a/js/common/tests/shell/shell-database.js.in b/js/common/tests/shell/shell-database.js similarity index 86% rename from js/common/tests/shell/shell-database.js.in rename to js/common/tests/shell/shell-database.js index a9449b6279..355e1d1a83 100644 --- a/js/common/tests/shell/shell-database.js.in +++ b/js/common/tests/shell/shell-database.js @@ -28,41 +28,6 @@ /// @author Copyright 2012, triAGENS GmbH, Cologne, Germany //////////////////////////////////////////////////////////////////////////////// -/// DO NOT EDIT FILE shell-database.js. IT IS AUTO-GENERATED BY FILE shell-database.js.in. -/// DO NOT EDIT FILE shell-database.js. IT IS AUTO-GENERATED BY FILE shell-database.js.in. -/// DO NOT EDIT FILE shell-database.js. IT IS AUTO-GENERATED BY FILE shell-database.js.in. -/// DO NOT EDIT FILE shell-database.js. IT IS AUTO-GENERATED BY FILE shell-database.js.in. -/// DO NOT EDIT FILE shell-database.js. IT IS AUTO-GENERATED BY FILE shell-database.js.in. -/// DO NOT EDIT FILE shell-database.js. IT IS AUTO-GENERATED BY FILE shell-database.js.in. -/// DO NOT EDIT FILE shell-database.js. IT IS AUTO-GENERATED BY FILE shell-database.js.in. -/// DO NOT EDIT FILE shell-database.js. IT IS AUTO-GENERATED BY FILE shell-database.js.in. -/// DO NOT EDIT FILE shell-database.js. IT IS AUTO-GENERATED BY FILE shell-database.js.in. -/// DO NOT EDIT FILE shell-database.js. IT IS AUTO-GENERATED BY FILE shell-database.js.in. -/// DO NOT EDIT FILE shell-database.js. IT IS AUTO-GENERATED BY FILE shell-database.js.in. -/// DO NOT EDIT FILE shell-database.js. IT IS AUTO-GENERATED BY FILE shell-database.js.in. -/// DO NOT EDIT FILE shell-database.js. IT IS AUTO-GENERATED BY FILE shell-database.js.in. -/// DO NOT EDIT FILE shell-database.js. IT IS AUTO-GENERATED BY FILE shell-database.js.in. -/// DO NOT EDIT FILE shell-database.js. IT IS AUTO-GENERATED BY FILE shell-database.js.in. -/// DO NOT EDIT FILE shell-database.js. IT IS AUTO-GENERATED BY FILE shell-database.js.in. -/// DO NOT EDIT FILE shell-database.js. IT IS AUTO-GENERATED BY FILE shell-database.js.in. -/// DO NOT EDIT FILE shell-database.js. IT IS AUTO-GENERATED BY FILE shell-database.js.in. -/// DO NOT EDIT FILE shell-database.js. IT IS AUTO-GENERATED BY FILE shell-database.js.in. -/// DO NOT EDIT FILE shell-database.js. IT IS AUTO-GENERATED BY FILE shell-database.js.in. -/// DO NOT EDIT FILE shell-database.js. IT IS AUTO-GENERATED BY FILE shell-database.js.in. -/// DO NOT EDIT FILE shell-database.js. IT IS AUTO-GENERATED BY FILE shell-database.js.in. -/// DO NOT EDIT FILE shell-database.js. IT IS AUTO-GENERATED BY FILE shell-database.js.in. -/// DO NOT EDIT FILE shell-database.js. IT IS AUTO-GENERATED BY FILE shell-database.js.in. -/// DO NOT EDIT FILE shell-database.js. IT IS AUTO-GENERATED BY FILE shell-database.js.in. -/// DO NOT EDIT FILE shell-database.js. IT IS AUTO-GENERATED BY FILE shell-database.js.in. -/// DO NOT EDIT FILE shell-database.js. IT IS AUTO-GENERATED BY FILE shell-database.js.in. -/// DO NOT EDIT FILE shell-database.js. IT IS AUTO-GENERATED BY FILE shell-database.js.in. -/// DO NOT EDIT FILE shell-database.js. IT IS AUTO-GENERATED BY FILE shell-database.js.in. -/// DO NOT EDIT FILE shell-database.js. IT IS AUTO-GENERATED BY FILE shell-database.js.in. -/// DO NOT EDIT FILE shell-database.js. IT IS AUTO-GENERATED BY FILE shell-database.js.in. -/// DO NOT EDIT FILE shell-database.js. IT IS AUTO-GENERATED BY FILE shell-database.js.in. -/// DO NOT EDIT FILE shell-database.js. IT IS AUTO-GENERATED BY FILE shell-database.js.in. -/// DO NOT EDIT FILE shell-database.js. IT IS AUTO-GENERATED BY FILE shell-database.js.in. - var jsunity = require("jsunity"); var internal = require("internal"); var arangodb = require("@arangodb"); @@ -96,14 +61,6 @@ function DatabaseSuite () { internal.wait(0); }, -//////////////////////////////////////////////////////////////////////////////// -/// @brief test the version information -//////////////////////////////////////////////////////////////////////////////// - - testVersion : function () { - assertMatch(/(^@ARANGODB_VERSION_MAJOR@\.@ARANGODB_VERSION_MINOR@)|(devel$)/, internal.db._version()); - }, - //////////////////////////////////////////////////////////////////////////////// /// @brief test _name function ////////////////////////////////////////////////////////////////////////////////