Review comments

Author: iamlouk

Fortran/gfortran/CMakeLists.txt

@@ -716,18 +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
+  # When running in an 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")
+    set(NOT_TOOL "not-spawning-emulator")
   else()
-    set(NOT_HELPER "not")
+    set(NOT_TOOL "not")
   endif()
 
   llvm_test_executable_no_test(${target} ${main} ${others})
   if (expect_error)
     llvm_test_run(
-      EXECUTABLE "%b/${NOT_HELPER} --crash %S/${target}"
+      EXECUTABLE "%b/${NOT_TOOL} --crash %S/${target}"
       WORKDIR "%S/${working_dir_name}")
   else ()
     llvm_test_run(WORKDIR "%S/${working_dir_name}")

tools/not.cpp

@@ -62,7 +62,7 @@ int main(int argc, char* const* argv) {
   // 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.
+  // string literals.
   std::vector<char *> argvbuf = {TEST_SUITE_RUN_UNDER};
   for (char *const *argp = argv; *argp != NULL; ++argp)
     argvbuf.push_back(*argp);

tools/test/CMakeLists.txt

@@ -13,26 +13,25 @@ add_dependencies(ret0 not)
 llvm_test_run(EXECUTABLE "$<TARGET_FILE:not>" "$<TARGET_FILE:not>" "$<TARGET_FILE:ret0>")
 llvm_add_test_for_target(ret0)
 
-# 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))
+if(TEST_SUITE_USER_MODE_EMULATION AND TEST_SUITE_RUN_UNDER)
+  # 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)
+else()
   # 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.
+  # This test is disabled in case of user-mode emulation because it would otherwise run the
+  # host python interpreter under the target emulator.
   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()