Browse Source

memcheck script improved

Can adopt external extra flags
Alexey N. Vinogradov 4 years ago
parent
commit
c2d58d37b4
2 changed files with 10 additions and 4 deletions
  1. 4 0
      misc/ctest/memcheck.cmake
  2. 6 4
      smoke.sh

+ 4 - 0
misc/ctest/memcheck.cmake

@@ -7,6 +7,7 @@ set ( CTEST_CMAKE_GENERATOR "$ENV{CTEST_CMAKE_GENERATOR}" )
 set ( LIBS_BUNDLE "$ENV{LIBS_BUNDLE}" )
 set ( CTEST_REGEX "$ENV{CTEST_REGEX}" )
 set ( SEARCHD_CLI_EXTRA "$ENV{SEARCHD_CLI_EXTRA}" )
+set ( XTRA_FLAGS "$ENV{XTRA_FLAGS}" )
 set_property ( GLOBAL PROPERTY Label P$ENV{CI_PIPELINE_ID} J$ENV{CI_JOB_ID} )
 
 if (NOT CTEST_CMAKE_GENERATOR)
@@ -55,6 +56,9 @@ set ( CMAKE_CALL "${CMAKE_COMMAND} \"-G${CTEST_CMAKE_GENERATOR}\" -DCMAKE_BUILD_
 foreach ( OPTION ${CONFIG_OPTIONS} )
 	set ( CMAKE_CALL "${CMAKE_CALL} -D${OPTION}" )
 endforeach ()
+foreach (OPTION ${XTRA_FLAGS})
+	set ( CMAKE_CALL "${CMAKE_CALL} -D${OPTION}" )
+endforeach ()
 set ( CTEST_CONFIGURE_COMMAND "${CMAKE_CALL} \"${CTEST_SOURCE_DIRECTORY}\"" )
 
 # will not write and count warnings in auto-generated files of lexer

+ 6 - 4
smoke.sh

@@ -4,7 +4,9 @@
 chmod +x valgrind
 cd build
 
-#export CTEST_BUILD_CONFIGURATION=RelWithDebInfo
-#ctest -V -S ../misc/ctest/memcheck.cmake
-export CTEST_BUILD_CONFIGURATION=Debug
-ctest -V -S ../misc/ctest/gltest.cmake
+export CTEST_BUILD_CONFIGURATION=RelWithDebInfo
+export CTEST_CMAKE_GENERATOR=Ninja
+export XTRA_FLAGS="CMAKE_C_COMPILER=/usr/bin/clang-12;CMAKE_CXX_COMPILER=/usr/bin/clang++-12"
+ctest -V -S ../misc/ctest/memcheck.cmake
+#export CTEST_BUILD_CONFIGURATION=Debug
+#ctest -V -S ../misc/ctest/gltest.cmake