Adapt to c/9382: Use unstripped test binaries

Depends-On: 9382,9384
Change-Id: I1119611c305d63577d18b4042a7209d48cc8013d

test/helpers/hwtest_common.py

@@ -14,7 +14,8 @@ TEST_BINARY_PATH = os.environ.get("TEST_BINARY_PATH",
                                        os.pardir,
                                        os.pardir,
                                        "build",
-                                       "libnux")
+                                       "libnux",
+                                       "test")
                                   )
 
 if not os.path.isdir(TEST_BINARY_PATH):
@@ -68,7 +69,7 @@ def find_binaries(dls_version: str) -> Set[PpuHwTest]:
     """
     ret = set()
 
-    test_regex = re.compile(r'(?:\b|_)[Tt]est.*' + dls_version + r'\.binary')
+    test_regex = re.compile(r'(?:\b|_)[Tt]est.*' + dls_version + r'\.bin$')
     for path, directories, files in os.walk(TEST_BINARY_PATH):
         for f in files:
             if test_regex.search(f):
@@ -91,15 +92,15 @@ def get_special_binaries(dls_version: str) -> Set[PpuHwTest]:
 
     return {
         PpuHwTest(
-            join(TEST_BINARY_PATH, f"test_unittest_{dls_version}.binary"),
+            join(TEST_BINARY_PATH, f"test_unittest_{dls_version}.bin"),
             expected_exit_code=1),
         PpuHwTest(
-            join(TEST_BINARY_PATH, f"test_returncode_{dls_version}.binary"),
+            join(TEST_BINARY_PATH, f"test_returncode_{dls_version}.bin"),
             expected_exit_code=-559038737),
         PpuHwTest(
-            join(TEST_BINARY_PATH, f"test_stack_guard_{dls_version}.binary"),
+            join(TEST_BINARY_PATH, f"test_stack_guard_{dls_version}.bin"),
             expected_exit_code=stack_protection * -559038737),
         PpuHwTest(
-            join(TEST_BINARY_PATH, f"test_stack_redzone_{dls_version}.binary"),
+            join(TEST_BINARY_PATH, f"test_stack_redzone_{dls_version}.bin"),
             expected_exit_code=12 if stack_redzone else 2)
     }

wscript

@@ -42,7 +42,6 @@ def configure(conf):
     conf.setenv('nux')
     conf.load('nux_assembler')
     conf.load('nux_compiler')
-    conf.load('objcopy')
     conf.load('test_base')
     conf.env.append_value('LINKFLAGS', '-T%s' % conf.path.find_node('libnux/elf32nux.x').abspath())
     conf.env.append_value('ASLINKFLAGS', '-T%s' % conf.path.find_node('libnux/elf32nux.x').abspath())
@@ -171,8 +170,7 @@ def build(bld):
 
         for program in program_list:
             bld.program(
-                features = 'cxx objcopy',
-                objcopy_bfdname = 'binary',
+                features = 'cxx',
                 target = program.replace('.cpp', '') + '_' + dls_version + '.bin',
                 source = [program],
                 use = ['nux_' + dls_version, 'nux_runtime_' + dls_version],
@@ -209,9 +207,8 @@ def build(bld):
                     return 976
 
         bld.program(
-            features = 'cxx objcopy check_size',
+            features = 'cxx check_size',
             check_size_max = max_size_empty(),
-            objcopy_bfdname = 'binary',
             target = 'test_empty_' + dls_version + '.bin',
             source = ['test/test_empty.cpp'],
             use = ['nux_' + dls_version, 'nux_runtime_' + dls_version],
@@ -228,7 +225,7 @@ def build(bld):
         env = bld.all_envs[''],
         test_environ = dict(STACK_PROTECTION=env.LIBNUX_STACK_PROTECTOR_ENABLED[0],
                             STACK_REDZONE=env.LIBNUX_STACK_REDZONE_ENABLED[0],
-                            TEST_BINARY_PATH=os.path.join(bld.env.PREFIX, 'build', 'libnux')),
+                            TEST_BINARY_PATH=os.path.join(bld.env.PREFIX, 'build', 'libnux', 'test')),
         pylint_config=join(get_toplevel_path(), "code-format", "pylintrc"),
         pycodestyle_config=join(get_toplevel_path(), "code-format", "pycodestyle"),
         test_timeout = 3600
@@ -244,7 +241,7 @@ def build(bld):
         env = bld.all_envs[''],
         test_environ = dict(STACK_PROTECTION=env.LIBNUX_STACK_PROTECTOR_ENABLED[0],
                             STACK_REDZONE=env.LIBNUX_STACK_REDZONE_ENABLED[0],
-                            TEST_BINARY_PATH=os.path.join(bld.env.PREFIX, 'build', 'libnux'))
+                            TEST_BINARY_PATH=os.path.join(bld.env.PREFIX, 'build', 'libnux', 'test'))
     )
 
     bld.add_post_fun(summary)