Use NULL separator in RPATH script

Author: Flamefire

easybuild/scripts/rpath_args.py

@@ -183,4 +183,4 @@ def add_rpath_flag(lib_path, rpath_filter, rpath_lib_paths, cmd_args_rpath, ldfl
     cmd_args = cmd_args_rpath + cmd_args
 
 
-print('\n'.join(cmd_args))
+print('\0'.join(cmd_args), end='')

easybuild/scripts/rpath_wrapper_template.sh.in

@@ -54,7 +54,7 @@ log "found CMD: $CMD | original command: %(orig_cmd)s | orig args: $*)"
 # * -S: disable the import of the module site and the site-dependent manipulations of sys.path that it entails;
 # (once we only support Python 3, we can (also) use -I (isolated mode)
 log "%(python)s -E -O -s -S %(rpath_args_py)s $CMD '%(rpath_filter)s' '%(rpath_include)s' $*"
-readarray -t CMD_ARGS < <( %(python)s -E -O -s -S %(rpath_args_py)s $CMD '%(rpath_filter)s' '%(rpath_include)s' "$@" )
+readarray -d '' -t CMD_ARGS < <( %(python)s -E -O -s -S %(rpath_args_py)s $CMD '%(rpath_filter)s' '%(rpath_include)s' "$@" )
 
 # exclude location of this wrapper from $PATH to avoid other potential wrappers calling this wrapper
 export PATH=$(echo "$PATH" | tr ':' '\n' | grep -v "^%(wrapper_dir)s$" | tr '\n' ':')

test/framework/toolchain.py

@@ -82,16 +82,19 @@ def tearDown(self):
         st.get_cpu_vendor = self.orig_get_cpu_vendor
         super().tearDown()
 
-    def run_cmd_and_split(self, cmd):
+    def run_cmd_and_split(self, cmd, sep='\0'):
         """Run the command, check return code and return output as list of lines"""
         with self.mocked_stdout_stderr():
             res = run_shell_cmd(cmd)
         self.assertEqual(res.exit_code, 0)
         out = res.output
-        # Remove 1 trailing newline
-        if out:
-            self.assertEqual(out[-1], '\n')
-        return out[:-1].split('\n')
+        if sep == '\0':
+            return out.split('\0')
+        else:
+            # Remove 1 trailing separator
+            if out:
+                self.assertEqual(out[-1], sep)
+            return out[:-1].split(sep)
 
     def get_toolchain(self, name, version=None):
         """Get a toolchain object instance to test with."""
@@ -3123,7 +3126,7 @@ def test_toolchain_prepare_rpath(self):
             r"-DY1=\'\'",
             r"-DY2=\'J\'",
         ])
-        out = self.run_cmd_and_split(cmd)
+        out = self.run_cmd_and_split(cmd, sep='\n')
         expected = [
             '-Wl,--disable-new-dtags',
             '-Wl,-rpath=%s/foo' % self.test_prefix,
@@ -3165,7 +3168,7 @@ def test_toolchain_prepare_rpath(self):
         args.append('-L"%s"' % path_with_spaces)
 
         cmd = "g++ ${USER}.c %s" % ' '.join(args)
-        out = self.run_cmd_and_split(cmd)
+        out = self.run_cmd_and_split(cmd, sep='\n')
 
         expected = ('\n'.join([
             '-Wl,--disable-new-dtags',

test/framework/toy_build.py

@@ -2978,7 +2978,7 @@ def grab_gcc_rpath_wrapper_args():
             gcc_rpath_wrapper_txt = read_file(glob.glob(os.path.join(rpath_wrappers_dir, '*', 'gcc'))[0])
 
             # Get the filter and include arguments
-            rpath_args_regex = re.compile(r"^readarray -t CMD_ARGS .*rpath_args.py \$CMD "
+            rpath_args_regex = re.compile(r"^readarray -d '' -t CMD_ARGS .*rpath_args.py \$CMD "
                                           r"'(?P<filter_paths>[^ ]*)' '(?P<include_paths>[^ ]*)'.*", re.M)
             res = rpath_args_regex.search(gcc_rpath_wrapper_txt)
             self.assertTrue(res, "Pattern '%s' found in: %s" % (rpath_args_regex.pattern, gcc_rpath_wrapper_txt))