zorba-coders team mailing list archive

[Chris Hillery <chillery+launchpad@xxxxxxxxx>]

Chris Hillery has proposed merging lp:~zorba-coders/zorba/fix-shebang-test into lp:zorba.

Commit message:
Don't use absolute path for shebang test - can be too long on RQ.

Requested reviews:
  Zorba Coders (zorba-coders)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/fix-shebang-test/+merge/161785
-- 
https://code.launchpad.net/~zorba-coders/zorba/fix-shebang-test/+merge/161785
Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/fix-shebang-test into lp:zorba.

=== modified file 'bin/CMakeLists.txt'
--- bin/CMakeLists.txt	2013-05-01 03:14:44 +0000
+++ bin/CMakeLists.txt	2013-05-01 06:59:27 +0000
@@ -80,9 +80,9 @@
 ZORBA_SET_TEST_PROPERTY(bin/zorba5 PASS_REGULAR_EXPRESSION ".*No queries submitted.*")
 
 IF (UNIX)
-  CONFIGURE_FILE ("${CMAKE_CURRENT_SOURCE_DIR}/test/shebang.xq.in"
-    "${CMAKE_CURRENT_BINARY_DIR}/shebang.xq" @ONLY)
-  ADD_TEST (bin/shebang "${CMAKE_CURRENT_BINARY_DIR}/shebang.xq")
+  ADD_TEST (NAME bin/shebang
+    COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/test/shebang.xq"
+    WORKING_DIRECTORY "${CMAKE_BINARY_DIR}")
   SET_TESTS_PROPERTIES (bin/shebang PROPERTIES PASS_REGULAR_EXPRESSION "shebang success")
 ENDIF (UNIX)
 

=== renamed file 'bin/test/shebang.xq.in' => 'bin/test/shebang.xq'
--- bin/test/shebang.xq.in	2013-05-01 03:14:44 +0000
+++ bin/test/shebang.xq	2013-05-01 06:59:27 +0000
@@ -1,2 +1,2 @@
-#!@ZORBA_EXE@
+#!bin/zorba
 "shebang success"