Changeset: 56d93d3a9942 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=56d93d3a9942
Modified Files:
testing/CMakeLists.txt
testing/Mtest.py.in
testing/listexports.py.in
Branch: cmake-fun
Log Message:
Simplify testing variables.
diffs (59 lines):
diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
--- a/testing/CMakeLists.txt
+++ b/testing/CMakeLists.txt
@@ -9,11 +9,8 @@
add_executable(Mdiff difflib.c helpers.c Mdiff.c difflib.h helpers.h)
install(TARGETS Mdiff DESTINATION ${BINDIR})
-string(REPLACE "\\" "\\\\" SOURCE "${CMAKE_SOURCE_DIR}")
+string(REPLACE "\\" "\\\\" QXbindir "${BINDIR}")
string(REPLACE "\\" "\\\\" QXBUILD "${CMAKE_BINARY_DIR}")
-string(REPLACE "\\" "\\\\" QXSOURCE "${CMAKE_SOURCE_DIR}")
-
-string(REPLACE "\\" "\\\\" QXbindir "${BINDIR}") # TODO confirm these changes
string(REPLACE "\\" "\\\\" QXdatadir "${DATADIR}")
string(REPLACE "\\" "\\\\" QXdatarootdir "${DATAROOTDIR}")
string(REPLACE "\\" "\\\\" QXexec_prefix "${CMAKE_INSTALL_PREFIX}")
@@ -24,11 +21,10 @@ string(REPLACE "\\" "\\\\" QXlibexecdir
string(REPLACE "\\" "\\\\" QXlocalstatedir "${LOCALSTATEDIR}")
string(REPLACE "\\" "\\\\" QXmandir "${MANDIR}")
string(REPLACE "\\" "\\\\" QXprefix "${CMAKE_INSTALL_PREFIX}")
-string(REPLACE "\\" "\\\\" QXsysconfdir "${SYSCONFDIR}")
-
-set(PYTHON3 "${Python3_EXECUTABLE}")
string(REPLACE "\\" "\\\\" QXPYTHON3 "${Python3_EXECUTABLE}")
string(REPLACE "\\" "\\\\" QXPYTHON3_LIBDIR "${PYTHON3_LIBDIR}")
+string(REPLACE "\\" "\\\\" QXSOURCE "${CMAKE_SOURCE_DIR}")
+string(REPLACE "\\" "\\\\" QXsysconfdir "${SYSCONFDIR}")
if(CMAKE_SIZEOF_VOID_P EQUAL 4)
set(BITS32_FALSE "#")
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -1,4 +1,4 @@
-#!@PYTHON3@
+#!@Python3_EXECUTABLE@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -413,7 +413,6 @@ CONDITIONALS = {
'HAVE_SAMTOOLS' : "@HAVE_SAMTOOLS_FALSE@",
'NATIVE_WIN32' : "@NATIVE_WIN32_FALSE@",
'NOT_WIN32' : "@NOT_WIN32_FALSE@",
- 'PROFILING' : "@PROFILING_FALSE@",
# unknown at compile time;
# hence, we set them only at runtime in main() below
'KNOWNFAIL' : "", # skip on release branch when not in testweb
diff --git a/testing/listexports.py.in b/testing/listexports.py.in
--- a/testing/listexports.py.in
+++ b/testing/listexports.py.in
@@ -26,7 +26,7 @@ skipdirs = ['extras']
skipfiles = ['monet_getopt.h']
# where the files are
-srcdir = r'@SOURCE@'
+srcdir = r'@QXSOURCE@'
# the export command; note the keyword we look for is a word that ends
# in "export"
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
