From c32b4f5dc008f5b6afeca0400d2be54c64bc5302 Mon Sep 17 00:00:00 2001 From: "U-BASIS\\zhaohui" Date: Thu, 10 May 2018 15:28:29 -0400 Subject: [PATCH] 3827: Update regression.py to take care of the new platform structure. --- test/script/regression.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/test/script/regression.py b/test/script/regression.py index a157851753..bf8068b4c5 100644 --- a/test/script/regression.py +++ b/test/script/regression.py @@ -468,9 +468,11 @@ class TestRunner(object): # if need autopsyPlatform setup if len(test_data.main_config.autopsyPlatform) > 0: - test_data.ant.append("-Dnbplatform.Autopsy_" + autopsyVersion + ".netbeans.dest.dir=" + test_data.main_config.autopsyPlatform) - test_data.ant.append("-Dnbplatform.default.harness.dir=" + test_data.main_config.autopsyPlatform + "/harness") - test_data.ant.append("-Dnbplatform.Autopsy_" + autopsyVersion + ".harness.dir=" + test_data.main_config.autopsyPlatform + "/harness") + platformPath = os.path.join(test_data.main_config.autopsyPlatform, "autopsy-" + autopsyVersion) + harnessDir = os.path.join(platformPath, "harness") + test_data.ant.append("-Dnbplatform.Autopsy_" + autopsyVersion + ".netbeans.dest.dir=" + platformPath) + test_data.ant.append("-Dnbplatform.default.harness.dir=" + harnessDir) + test_data.ant.append("-Dnbplatform.Autopsy_" + autopsyVersion + ".harness.dir=" + harnessDir) Errors.print_out("Ingesting Image:\n" + test_data.image_file + "\n") Errors.print_out("CMD: " + " ".join(test_data.ant))