Replace test_embed → test_with_catch (b/o pybind/pybind11#5824)

Author: rwgk

SConscript

@@ -171,7 +171,7 @@ env_base.Clone(
     LINKFLAGS=["-shared", "-fPIC"] + opt_opt,
     LIBPREFIX="").SharedLibrary(
         target="#lib/external_module",
-        source=["#pybind11/tests/test_embed/external_module.cpp"])
+        source=["#pybind11/tests/test_with_catch/external_module.cpp"])
 
 env_base.Clone(
     CPPDEFINES=extra_defines,
@@ -182,9 +182,9 @@ env_base.Clone(
     LINKFLAGS=["-rdynamic", f"-Wl,-rpath,{python_libdir}"] + opt_opt,
     LIBPATH=["lib", python_libdir],
     LIBS=[python_lib, "pthread", "dl", "util"]).Program(
-        target="#bin/test_embed",
+        target="#bin/test_with_catch",
         source=build_paths_in_subdir(
-            "#pybind11/tests/test_embed",
+            "#pybind11/tests/test_with_catch",
             ["test_interpreter.cpp",
              "catch.cpp"]))
 

run_tests.py

@@ -59,7 +59,7 @@ def substring_match(test_name):
     if 1 in in_out_seen:
       return False
     return -1 in in_out_seen
-  test_embed = substring_match("test_embed")
+  test_with_catch = substring_match("test_with_catch")
   list_of_test_py = []
   for test_py in all_test_py:
     if substring_match(test_py):
@@ -70,7 +70,7 @@ def substring_match(test_name):
         "Unused command-line argument%s: %s" % (
             plural_s(len(substring_unused)),
             " ".join(sorted(substring_unused))))
-  return test_embed, list_of_test_py
+  return test_with_catch, list_of_test_py
 
 
 def plural_s(num, suffix="s"):
@@ -133,15 +133,15 @@ def run(args):
       substrings.add(arg)
   assert pybind11_dirpath is not None
   tests_dirpath = os.path.join(pybind11_dirpath, "tests")
-  test_embed_dirpath = os.path.join(tests_dirpath, "test_embed")
-  test_embed, list_of_test_py = build_list_of_tests(tests_dirpath, substrings)
+  test_with_catch_dirpath = os.path.join(tests_dirpath, "test_with_catch")
+  test_with_catch, list_of_test_py = build_list_of_tests(tests_dirpath, substrings)
   env = {"PYTHONPATH": normabspath("lib")}
-  if test_embed:
-    bin_test_embed = normabspath("bin/test_embed")
+  if test_with_catch:
+    bin_test_with_catch = normabspath("bin/test_with_catch")
     print('(cd "%s" && PATH= LD_LIBRARY_PATH= PYTHONPATH="%s" "%s")' % (
-        test_embed_dirpath, env["PYTHONPATH"], bin_test_embed))
+        test_with_catch_dirpath, env["PYTHONPATH"], bin_test_with_catch))
     sys.stdout.flush()
-    subprocess.call([bin_test_embed], cwd=test_embed_dirpath, env=env)
+    subprocess.call([bin_test_with_catch], cwd=test_with_catch_dirpath, env=env)
   if i_opt:
     print('Running %d individual test(s) in directory "%s":'
           % (len(list_of_test_py), tests_dirpath))