You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2014/12/10 18:25:56 UTC
svn commit: r1644487 - in /qpid/dispatch/trunk: CMakeLists.txt run.py.in
tests/CMakeLists.txt tests/run.py.in
Author: aconway
Date: Wed Dec 10 17:25:56 2014
New Revision: 1644487
URL: http://svn.apache.org/r1644487
Log:
NO-JIRA: Move run.py to top level build directory, generate config.sh.
Added:
qpid/dispatch/trunk/run.py.in
- copied, changed from r1644340, qpid/dispatch/trunk/tests/run.py.in
Removed:
qpid/dispatch/trunk/tests/run.py.in
Modified:
qpid/dispatch/trunk/CMakeLists.txt
qpid/dispatch/trunk/tests/CMakeLists.txt
Modified: qpid/dispatch/trunk/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/CMakeLists.txt?rev=1644487&r1=1644486&r2=1644487&view=diff
==============================================================================
--- qpid/dispatch/trunk/CMakeLists.txt (original)
+++ qpid/dispatch/trunk/CMakeLists.txt Wed Dec 10 17:25:56 2014
@@ -64,7 +64,7 @@ set(SHARE_INSTALL_DIR share CACHE PATH "
set(DOC_INSTALL_DIR ${SHARE_INSTALL_DIR}/doc CACHE PATH "Shared read-only data directory")
set(MAN_INSTALL_DIR share/man CACHE PATH "Manpage directory")
set(QPID_DISPATCH_HOME_INSTALLED ${CMAKE_INSTALL_PREFIX}/${QPID_DISPATCH_HOME})
-set(RUN ${PYTHON_EXECUTABLE} ${CMAKE_BINARY_DIR}/tests/run.py)
+set(RUN ${PYTHON_EXECUTABLE} ${CMAKE_BINARY_DIR}/run.py)
# define the configuration directory based on whether or not the install prefix is defined
if(NOT DEFINED SYSCONF_INSTALL_DIR)
@@ -133,6 +133,12 @@ install(FILES
add_subdirectory(src) # Build src first so other subdirs can use QPID_DISPATCH_LIB
+
+# run.py environment runner script - needs QPID_DISPATCH_LIB
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/run.py.in ${CMAKE_CURRENT_BINARY_DIR}/run.py)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/run.py.in ${CMAKE_CURRENT_BINARY_DIR}/tests/run.py)
+execute_process(COMMAND ${RUN} --sh OUTPUT_FILE config.sh)
+
add_subdirectory(tests)
add_subdirectory(python)
add_subdirectory(router)
Copied: qpid/dispatch/trunk/run.py.in (from r1644340, qpid/dispatch/trunk/tests/run.py.in)
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/run.py.in?p2=qpid/dispatch/trunk/run.py.in&p1=qpid/dispatch/trunk/tests/run.py.in&r1=1644340&r2=1644487&rev=1644487&view=diff
==============================================================================
(empty)
Modified: qpid/dispatch/trunk/tests/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/CMakeLists.txt?rev=1644487&r1=1644486&r2=1644487&view=diff
==============================================================================
--- qpid/dispatch/trunk/tests/CMakeLists.txt (original)
+++ qpid/dispatch/trunk/tests/CMakeLists.txt Wed Dec 10 17:25:56 2014
@@ -50,8 +50,6 @@ set(unit_test_size_SOURCES
add_executable(unit_tests_size ${unit_test_size_SOURCES})
target_link_libraries(unit_tests_size qpid-dispatch)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/run.py.in ${CMAKE_CURRENT_BINARY_DIR}/run.py)
-
set(TEST_WRAP ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/run.py)
add_test(unit_tests_size_10000 ${TEST_WRAP} --vg unit_tests_size 10000)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org