diff --git a/test/jenkins/run_tests.conf b/test/jenkins/run_tests.conf index 87a7000ad..7b244bc29 100644 --- a/test/jenkins/run_tests.conf +++ b/test/jenkins/run_tests.conf @@ -4,8 +4,8 @@ "exec": "ssh -F ssh_config default {0}", "clean": "ssh -F ssh_config default rm -f {0}" }, - "tests": { - "destination": "/tmp" + "settings": { + "test_root": "/tmp" }, "setups": { } diff --git a/test/jenkins/run_tests.py b/test/jenkins/run_tests.py index 12612b514..2dea88f9c 100755 --- a/test/jenkins/run_tests.py +++ b/test/jenkins/run_tests.py @@ -89,12 +89,12 @@ class TestSuite(object): subprocess.call(command, shell=True) def _copy_test(self, path): - self._copy_file(path, os.path.join(self._config['tests']['destination'], + self._copy_file(path, os.path.join(self._config['settings']['test_root'], os.path.basename(path))) def _run_test(self, path): command = self._config['commands']['exec'] - target = os.path.join(self._config['tests']['destination'], + target = os.path.join(self._config['settings']['test_root'], os.path.basename(path)) p = subprocess.Popen(command.format(target), stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)