diff options
Diffstat (limited to 'tests/cli/testbuildandtest.py')
| -rw-r--r-- | tests/cli/testbuildandtest.py | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/tests/cli/testbuildandtest.py b/tests/cli/testbuildandtest.py index 948fe3a..a60f7e2 100644 --- a/tests/cli/testbuildandtest.py +++ b/tests/cli/testbuildandtest.py @@ -19,12 +19,14 @@ class Testllvmbuildandtest(LLVMTestCase): """ Test that we dump the correct commands for a single stage build of LLVM. """ + reposDir = "path-to-repos" sourceDir = "path-to-sources" buildDir = "path-to-stage1" output = self.run_with_output( self.llvm_build_and_test( "--dry-run", + "--repos-dir", reposDir, "--source-dir", sourceDir, "--stage1-build-dir", buildDir)) @@ -42,20 +44,22 @@ class Testllvmbuildandtest(LLVMTestCase): Test that we dump the correct commands for a single stage build of LLVM and a run of the test-suite with the resulting compiler. """ + reposDir = "path-to-repos" sourceDir = "path-to-sources" buildDir = "path-to-stage1" - testSuiteDir = "path-to-test-suite" sandboxDir = "path-to-sandbox" - lntDir = "path-to-lnt" + + testSuiteDir = os.path.join(reposDir, "test-suite") + lntDir = os.path.join(reposDir, "lnt") output = self.run_with_output( self.llvm_build_and_test( "--dry-run", + "--repos-dir", reposDir, "--source-dir", sourceDir, "--stage1-build-dir", buildDir, - "--test-suite", testSuiteDir, - "--sandbox", sandboxDir, - "--lnt", lntDir)) + "--enable-test-suite", + "--sandbox", sandboxDir)) commands = output.splitlines() @@ -86,6 +90,7 @@ class Testllvmbuildandtest(LLVMTestCase): """ Test that we dump the correct commands for a 2-stage build of LLVM. """ + reposDir = "path-to-repos" sourceDir = "path-to-sources" buildDir1 = "path-to-stage1" buildDir2 = "path-to-stage2" @@ -93,6 +98,7 @@ class Testllvmbuildandtest(LLVMTestCase): output = self.run_with_output( self.llvm_build_and_test( "--dry-run", + "--repos-dir", reposDir, "--source-dir", sourceDir, "--stage1-build-dir", buildDir1, "--stage2-build-dir", buildDir2)) @@ -123,22 +129,24 @@ class Testllvmbuildandtest(LLVMTestCase): Test that we dump the correct commands for a 2-stage build of LLVM and a run of the test-suite with the resulting compiler. """ + reposDir = "path-to-repos" sourceDir = "path-to-sources" buildDir1 = "path-to-stage1" buildDir2 = "path-to-stage2" - testSuiteDir = "path-to-test-suite" sandboxDir = "path-to-sandbox" - lntDir = "path-to-lnt" + + testSuiteDir = os.path.join(reposDir, "test-suite") + lntDir = os.path.join(reposDir, "lnt") output = self.run_with_output( self.llvm_build_and_test( "--dry-run", + "--repos-dir", reposDir, "--source-dir", sourceDir, "--stage1-build-dir", buildDir1, "--stage2-build-dir", buildDir2, - "--test-suite", testSuiteDir, - "--sandbox", sandboxDir, - "--lnt", lntDir)) + "--enable-test-suite", + "--sandbox", sandboxDir)) commands = output.splitlines() |