|
 |
9ef3c2 |
--- testsuite-12.1.0/CMakeLists.txt~ 2021-05-19 15:36:07.167215391 -0400
|
|
|
9ef3c2 |
+++ testsuite-12.1.0/CMakeLists.txt 2021-05-19 16:31:44.469592338 -0400
|
|
|
9ef3c2 |
@@ -1,4 +1,4 @@
|
|
|
9ef3c2 |
-cmake_minimum_required(VERSION 3.4.0)
|
|
|
9ef3c2 |
+cmake_minimum_required(VERSION 2.8)
|
|
|
9ef3c2 |
project(Dyninst-TestSuite)
|
|
|
9ef3c2 |
|
|
|
9ef3c2 |
# User must provide location of Dyninst cmake files either as a cache or
|
|
|
9ef3c2 |
@@ -322,1 +322,2 @@
|
|
|
9ef3c2 |
- find_program(M_gnu_cc NAMES ${CMAKE_MUT_C_COMPILER} ${CMAKE_C_COMPILER} gcc)
|
|
|
9ef3c2 |
+ # Force mutator to use devtoolset-12-gcc
|
|
|
9ef3c2 |
+ find_program(M_gnu_cc NAMES gcc PATHS /opt/rh/devtoolset-12/root/usr/bin NO_DEFAULT_PATH)
|
|
|
9ef3c2 |
@@ -324,1 +325,2 @@
|
|
|
9ef3c2 |
- find_program(M_gnu_cxx NAMES ${CMAKE_MUT_CXX_COMPILER} ${CMAKE_CXX_COMPILER} g++)
|
|
|
9ef3c2 |
+ # Force mutator to use devtoolset-12-gxx
|
|
|
9ef3c2 |
+ find_program(M_gnu_cxx NAMES g++ PATHS /opt/rh/devtoolset-12/root/usr/bin NO_DEFAULT_PATH)
|
|
|
9ef3c2 |
|
|
|
9ef3c2 |
|
|
|
9ef3c2 |
--- testsuite-12.1.0/checkMutateeCompiler.cmake
|
|
|
9ef3c2 |
+++ testsuite-12.1.0/checkMutateeCompiler.cmake
|
|
|
9ef3c2 |
@@ -5,10 +5,11 @@ MACRO (CHECK_MUTATEE_COMPILER _COMPILER _COMP_FLAG _LINK_FLAG _LANG _MSG _RESULT
|
|
|
9ef3c2 |
set(COMPILER_OUTPUT "")
|
|
|
9ef3c2 |
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/CMakeTmp/CompilerTest)
|
|
|
9ef3c2 |
if(${_LANG} MATCHES CXX)
|
|
|
9ef3c2 |
+ message ("CHECK_MUTATEE_COMPILER " ${CMAKE_BINARY_DIR}/CMakeTmp/CompilerTest " " ${CMAKE_COMMAND} " " -DCMAKE_CXX_COMPILER=${_COMPILER} " " -DCMAKE_CXX_FLAGS="${_COMP_FLAG}" " " -DCMAKE_EXE_LINKER_FLAGS="${_LINK_FLAG}" " " -G"${CMAKE_GENERATOR}" " " ${PROJECT_SOURCE_DIR}/compiler_test/cxx)
|
|
|
9ef3c2 |
execute_process(WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/CMakeTmp/CompilerTest
|
|
|
9ef3c2 |
RESULT_VARIABLE COMPILER_RESULT
|
|
|
9ef3c2 |
- OUTPUT_QUIET
|
|
|
9ef3c2 |
- ERROR_QUIET
|
|
|
9ef3c2 |
+# OUTPUT_QUIET
|
|
|
9ef3c2 |
+# ERROR_QUIET
|
|
|
9ef3c2 |
# OUTPUT_VARIABLE COMPILER_OUTPUT
|
|
|
9ef3c2 |
# ERROR_VARIABLE COMPILER_OUTPUT
|
|
|
9ef3c2 |
COMMAND ${CMAKE_COMMAND}
|
|
|
9ef3c2 |
@@ -31,10 +32,11 @@ MACRO (CHECK_MUTATEE_COMPILER _COMPILER _COMP_FLAG _LINK_FLAG _LANG _MSG _RESULT
|
|
|
9ef3c2 |
-G${CMAKE_GENERATOR}
|
|
|
9ef3c2 |
${PROJECT_SOURCE_DIR}/compiler_test/fortran)
|
|
|
9ef3c2 |
elseif (${_LANG} MATCHES C)
|
|
|
9ef3c2 |
+ message ("CHECK_MUTATEE_COMPILER " ${CMAKE_BINARY_DIR}/CMakeTmp/CompilerTest " " ${CMAKE_COMMAND} " " -DCMAKE_C_COMPILER=${_COMPILER} " " -DCMAKE_C_FLAGS="${_COMP_FLAG}" " " -DCMAKE_EXE_LINKER_FLAGS="${_LINK_FLAG}" " " -G"${CMAKE_GENERATOR}" " " ${PROJECT_SOURCE_DIR}/compiler_test/c)
|
|
|
9ef3c2 |
execute_process(WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/CMakeTmp/CompilerTest
|
|
|
9ef3c2 |
RESULT_VARIABLE COMPILER_RESULT
|
|
|
9ef3c2 |
- OUTPUT_QUIET
|
|
|
9ef3c2 |
- ERROR_QUIET
|
|
|
9ef3c2 |
+# OUTPUT_QUIET
|
|
|
9ef3c2 |
+# ERROR_QUIET
|
|
|
9ef3c2 |
# OUTPUT_VARIABLE COMPILER_OUTPUT
|
|
|
9ef3c2 |
# ERROR_VARIABLE COMPILER_OUTPUT
|
|
|
9ef3c2 |
COMMAND ${CMAKE_COMMAND}
|