[tools] Fix tools/test and not for user-mode emulation

Fortran/gfortran/CMakeLists.txt

@@ -716,10 +716,18 @@ function(gfortran_add_execute_test expect_error main others fflags ldflags)
   gfortran_make_working_dir("${target}" working_dir)
   get_filename_component(working_dir_name "${working_dir}" NAME)
 
+  # When running in a emulator, use the version of 'not' that will
+  # spawn the subprocess under that emulator as well.
+  if(TEST_SUITE_USER_MODE_EMULATION AND TEST_SUITE_RUN_UNDER)
+    set(NOT_HELPER "not-spawning-emulator")
+  else()
+    set(NOT_HELPER "not")
+  endif()
+
   llvm_test_executable_no_test(${target} ${main} ${others})
   if (expect_error)
     llvm_test_run(
-      EXECUTABLE "%b/not --crash %S/${target}"
+      EXECUTABLE "%b/${NOT_HELPER} --crash %S/${target}"
       WORKDIR "%S/${working_dir_name}")
   else ()
     llvm_test_run(WORKDIR "%S/${working_dir_name}")

tools/CMakeLists.txt

@@ -41,3 +41,18 @@ else()
 endif()
 
 add_executable(not ${CMAKE_CURRENT_SOURCE_DIR}/not.cpp)
+
+if(TEST_SUITE_USER_MODE_EMULATION AND TEST_SUITE_RUN_UNDER)
+  # Because 'not' spawns a subprocess for its argument, it needs to know about the
+  # emulator when running in user-mode emulation. This is not needed when using 'not' to
+  # verify outputs, only when using it to execute a test binary, which is why this
+  # definition is only added to the 'not-target' target.
+  separate_arguments(TEST_SUITE_RUN_UNDER_AS_LIST NATIVE_COMMAND ${TEST_SUITE_RUN_UNDER})
+  set(AS_STRINGLITS "")
+  foreach(arg ${TEST_SUITE_RUN_UNDER_AS_LIST})
+      set(AS_STRINGLITS "${AS_STRINGLITS}\t\"${arg}\",\n")
+  endforeach()
+  add_executable(not-spawning-emulator ${CMAKE_CURRENT_SOURCE_DIR}/not.cpp)
+  target_compile_definitions(not-spawning-emulator PUBLIC "-DTEST_SUITE_RUN_UNDER=${AS_STRINGLITS}")
+  unset(AS_STRINGLITS)
+endif()

tools/not.cpp

@@ -29,6 +29,10 @@
 #include <sys/wait.h>
 #endif
 
+#ifdef TEST_SUITE_RUN_UNDER
+#include <vector>
+#endif
+
 int main(int argc, char* const* argv) {
   bool expectCrash = false;
 
@@ -54,6 +58,19 @@ int main(int argc, char* const* argv) {
   if (argc == 0)
     return 1;
 
+#ifdef TEST_SUITE_RUN_UNDER
+  // In case of user-mode emulation, before spawning a new subprocess, the
+  // emulator needs to be preprended to the argv vector for the child.
+  // TEST_SUITE_RUN_UNDER will be defined to a comma-separated list of
+  // string litterals.
+  std::vector<char *> argvbuf = {TEST_SUITE_RUN_UNDER};
+  for (char *const *argp = argv; *argp != NULL; ++argp)
+    argvbuf.push_back(*argp);
+  argvbuf.push_back(NULL);
+  argv = argvbuf.data();
+  argc = argvbuf.size() - 1;
+#endif
+
   int result;
 
 #if defined(__unix__) || defined(__APPLE__)

tools/test/CMakeLists.txt

@@ -13,15 +13,26 @@ add_dependencies(ret0 not)
 llvm_test_run(EXECUTABLE "$<TARGET_FILE:not>" "$<TARGET_FILE:not>" "$<TARGET_FILE:ret0>")
 llvm_add_test_for_target(ret0)
 
-# Check that expected crashes are handled correctly.
-llvm_test_executable_no_test(abrt abort.c)
-add_dependencies(abrt not)
-llvm_test_run(EXECUTABLE "$<TARGET_FILE:not>" "--crash" "$<TARGET_FILE:abrt>")
-llvm_add_test_for_target(abrt)
+# These test will always fail under user-mode emulation because 'not'
+# spawns a subprocess outside the emulator and the check_env test
+# runs the host python interpreter under the emulator for the target.
+if(NOT(TEST_SUITE_USER_MODE_EMULATION AND TEST_SUITE_RUN_UNDER))
+  # Check that expected crashes are handled correctly.
+  llvm_test_executable_no_test(abrt abort.c)
+  add_dependencies(abrt not)
+  llvm_test_run(EXECUTABLE "$<TARGET_FILE:not>" "--crash" "$<TARGET_FILE:abrt>")
+  llvm_add_test_for_target(abrt)
 
-# Check that not passes environment variables to the called executable.
-find_package(Python COMPONENTS Interpreter)
-llvm_test_executable_no_test(check_env check_env.c)
-add_dependencies(check_env not)
-llvm_test_run(EXECUTABLE ${Python_EXECUTABLE} "%b/test/test_not.py" "$<TARGET_FILE:not>" "$<TARGET_FILE:check_env>")
-llvm_add_test_For_target(check_env)
+  # Check that not passes environment variables to the called executable.
+  find_package(Python COMPONENTS Interpreter)
+  llvm_test_executable_no_test(check_env check_env.c)
+  add_dependencies(check_env not)
+  llvm_test_run(EXECUTABLE ${Python_EXECUTABLE} "%b/test/test_not.py" "$<TARGET_FILE:not>" "$<TARGET_FILE:check_env>")
+  llvm_add_test_For_target(check_env)
+else()
+  # Check that expected crashes are handled correctly under user-mode emulation.
+  llvm_test_executable_no_test(abrt abort.c)
+  add_dependencies(abrt not-spawning-emulator)
+  llvm_test_run(EXECUTABLE "$<TARGET_FILE:not-spawning-emulator>" "--crash" "$<TARGET_FILE:abrt>")
+  llvm_add_test_for_target(abrt)
+endif()