Merge branch 'topic/SKIP-python-test-and-add-copy-files-on-target' into 'master'

Testsuite: use copy_files_on_target run_cross option

See merge request eng/toolchain/gnatcoll-core!32

Author: Aleksandra Pasek

testsuite/drivers/__init__.py

@@ -160,7 +160,7 @@ def gprbuild(driver,
 
 
 def bin_check_call(driver, cmd, slot, test_name=None, result=None, timeout=None,
-                   env=None, cwd=None, **kwargs):
+                   env=None, cwd=None, copy_files_on_target=None, **kwargs):
     if cwd is None and "working_dir" in driver.test_env:
         cwd = driver.test_env["working_dir"]
     if result is None:
@@ -178,6 +178,7 @@ def bin_check_call(driver, cmd, slot, test_name=None, result=None, timeout=None,
             timeout=timeout,
             output=None,
             slot=slot,
+            copy_files_on_target=copy_files_on_target,
         )
 
         # Here process.out holds utf-8 encoded data.

testsuite/drivers/basic.py

@@ -52,9 +52,12 @@ def run(self):
         gprbuild(self, gpr_project_path=gpr_project_path)
 
         # Copy the requested data files
+        copy_files_on_target = []
+
         for data in self.test_env.get('data', []):
             cp(os.path.join(self.test_env['test_dir'], data),
                self.test_env['working_dir'], recursive=True)
+            copy_files_on_target.append(os.path.join(self.test_env['working_dir'], data))
 
         pre_test_py = os.path.join(self.test_env['test_dir'], 'pre_test.py')
         if os.path.isfile(pre_test_py):
@@ -67,7 +70,8 @@ def run(self):
         process = run_test_program(
             self,
             [os.path.join(self.test_env['working_dir'], test_exe)],
-            self.slot,
+            slot=self.slot,
+            copy_files_on_target=copy_files_on_target,
             timeout=self.default_process_timeout)
         self.output += process.out.decode('utf-8')
 

testsuite/drivers/valgrind.py

@@ -1,7 +1,7 @@
 from drivers import bin_check_call
 
 
-def check_call_valgrind(driver, cmd, test_name=None, result=None, **kwargs):
+def check_call_valgrind(driver, cmd, slot, test_name=None, result=None, **kwargs):
     """
     Wrapper for `e3.testsuite.process` that runs the process under Valgrind if
     this is a Valgrind-checked testsuite run. The process exit status will be
@@ -10,4 +10,4 @@ def check_call_valgrind(driver, cmd, test_name=None, result=None, **kwargs):
     if driver.env.valgrind:
         cmd = ['valgrind', '-q', '--error-exitcode=2',
                '--leak-check=full'] + cmd
-    return bin_check_call(driver, cmd, test_name, result, **kwargs)
+    return bin_check_call(driver, cmd, slot, test_name, result, **kwargs)

testsuite/tests/os/process/inherit_env/test.yaml

@@ -1,2 +1,4 @@
 title: GNATCOLL.OS.Process test inherit_env parameter
 data: ["test_data/*.py"]
+control:
+  - [SKIP, "env.is_cross", "Test uses python which is not available on cross targets"]