Blob Blame History Raw
--- dyninst-11.0.0/testsuite-11.0.0/CMakeLists.txt~	2021-05-19 15:36:07.167215391 -0400
+++ dyninst-11.0.0/testsuite-11.0.0/CMakeLists.txt	2021-05-19 16:31:44.469592338 -0400
@@ -322,1 +322,2 @@
-  find_program(M_gnu_cc NAMES ${CMAKE_MUT_C_COMPILER} ${CMAKE_C_COMPILER} gcc)
+  # Force mutator to use devtoolset-11-gcc
+  find_program(M_gnu_cc NAMES gcc PATHS /opt/rh/devtoolset-11/root/usr/bin NO_DEFAULT_PATH)
@@ -324,1 +325,2 @@
-  find_program(M_gnu_cxx NAMES ${CMAKE_MUT_CXX_COMPILER} ${CMAKE_CXX_COMPILER} g++)
+  # Force mutator to use devtoolset-11-gxx
+  find_program(M_gnu_cxx NAMES g++ PATHS /opt/rh/devtoolset-11/root/usr/bin NO_DEFAULT_PATH)


--- dyninst-11.0.0/testsuite-11.0.0/checkMutateeCompiler.cmake
+++ dyninst-11.0.0/testsuite-11.0.0/checkMutateeCompiler.cmake
@@ -5,10 +5,11 @@ MACRO (CHECK_MUTATEE_COMPILER _COMPILER _COMP_FLAG _LINK_FLAG _LANG _MSG _RESULT
 	  set(COMPILER_OUTPUT "")
       file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/CMakeTmp/CompilerTest)
       if(${_LANG} MATCHES CXX)
+	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)
             execute_process(WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/CMakeTmp/CompilerTest
                             RESULT_VARIABLE COMPILER_RESULT
-                            OUTPUT_QUIET
-                            ERROR_QUIET
+#                            OUTPUT_QUIET
+#                            ERROR_QUIET
 #							OUTPUT_VARIABLE COMPILER_OUTPUT
 #							ERROR_VARIABLE COMPILER_OUTPUT
                             COMMAND ${CMAKE_COMMAND}
@@ -31,10 +32,11 @@ MACRO (CHECK_MUTATEE_COMPILER _COMPILER _COMP_FLAG _LINK_FLAG _LANG _MSG _RESULT
 			    -G${CMAKE_GENERATOR}
                             ${PROJECT_SOURCE_DIR}/compiler_test/fortran)
       elseif (${_LANG} MATCHES C)
+	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)
             execute_process(WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/CMakeTmp/CompilerTest
                             RESULT_VARIABLE COMPILER_RESULT
-                            OUTPUT_QUIET
-                            ERROR_QUIET
+#                            OUTPUT_QUIET
+#                            ERROR_QUIET
 #							OUTPUT_VARIABLE COMPILER_OUTPUT
 #							ERROR_VARIABLE COMPILER_OUTPUT
                             COMMAND ${CMAKE_COMMAND}