From d93bfd95f8661d399f71dca3b3a3907101939617 Mon Sep 17 00:00:00 2001 From: Bobby D Reynolds Date: Tue, 18 May 2021 08:44:27 -0700 Subject: Tests/CompilerLauncher: Fix file names and clarify comment --- Tests/RunCMake/CompilerLauncher/C-env-launch-Build-stdout.txt | 1 - Tests/RunCMake/CompilerLauncher/C-launch-env-Build-stdout.txt | 1 + Tests/RunCMake/CompilerLauncher/CUDA-env-launch-Build-stdout.txt | 1 - Tests/RunCMake/CompilerLauncher/CUDA-launch-env-Build-stdout.txt | 1 + Tests/RunCMake/CompilerLauncher/CXX-env-launch-Build-stdout.txt | 1 - Tests/RunCMake/CompilerLauncher/CXX-launch-env-Build-stdout.txt | 1 + Tests/RunCMake/CompilerLauncher/Fortran-env-launch-Build-stdout.txt | 1 - Tests/RunCMake/CompilerLauncher/Fortran-launch-env-Build-stdout.txt | 1 + Tests/RunCMake/CompilerLauncher/ISPC-env-launch-Build-stdout.txt | 1 - Tests/RunCMake/CompilerLauncher/ISPC-launch-env-Build-stdout.txt | 1 + Tests/RunCMake/CompilerLauncher/RunCMakeTest.cmake | 2 +- 11 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 Tests/RunCMake/CompilerLauncher/C-env-launch-Build-stdout.txt create mode 100644 Tests/RunCMake/CompilerLauncher/C-launch-env-Build-stdout.txt delete mode 100644 Tests/RunCMake/CompilerLauncher/CUDA-env-launch-Build-stdout.txt create mode 100644 Tests/RunCMake/CompilerLauncher/CUDA-launch-env-Build-stdout.txt delete mode 100644 Tests/RunCMake/CompilerLauncher/CXX-env-launch-Build-stdout.txt create mode 100644 Tests/RunCMake/CompilerLauncher/CXX-launch-env-Build-stdout.txt delete mode 100644 Tests/RunCMake/CompilerLauncher/Fortran-env-launch-Build-stdout.txt create mode 100644 Tests/RunCMake/CompilerLauncher/Fortran-launch-env-Build-stdout.txt delete mode 100644 Tests/RunCMake/CompilerLauncher/ISPC-env-launch-Build-stdout.txt create mode 100644 Tests/RunCMake/CompilerLauncher/ISPC-launch-env-Build-stdout.txt diff --git a/Tests/RunCMake/CompilerLauncher/C-env-launch-Build-stdout.txt b/Tests/RunCMake/CompilerLauncher/C-env-launch-Build-stdout.txt deleted file mode 100644 index 3313e31..0000000 --- a/Tests/RunCMake/CompilerLauncher/C-env-launch-Build-stdout.txt +++ /dev/null @@ -1 +0,0 @@ -.*-E env USED_LAUNCHER=1.* diff --git a/Tests/RunCMake/CompilerLauncher/C-launch-env-Build-stdout.txt b/Tests/RunCMake/CompilerLauncher/C-launch-env-Build-stdout.txt new file mode 100644 index 0000000..3313e31 --- /dev/null +++ b/Tests/RunCMake/CompilerLauncher/C-launch-env-Build-stdout.txt @@ -0,0 +1 @@ +.*-E env USED_LAUNCHER=1.* diff --git a/Tests/RunCMake/CompilerLauncher/CUDA-env-launch-Build-stdout.txt b/Tests/RunCMake/CompilerLauncher/CUDA-env-launch-Build-stdout.txt deleted file mode 100644 index 3313e31..0000000 --- a/Tests/RunCMake/CompilerLauncher/CUDA-env-launch-Build-stdout.txt +++ /dev/null @@ -1 +0,0 @@ -.*-E env USED_LAUNCHER=1.* diff --git a/Tests/RunCMake/CompilerLauncher/CUDA-launch-env-Build-stdout.txt b/Tests/RunCMake/CompilerLauncher/CUDA-launch-env-Build-stdout.txt new file mode 100644 index 0000000..3313e31 --- /dev/null +++ b/Tests/RunCMake/CompilerLauncher/CUDA-launch-env-Build-stdout.txt @@ -0,0 +1 @@ +.*-E env USED_LAUNCHER=1.* diff --git a/Tests/RunCMake/CompilerLauncher/CXX-env-launch-Build-stdout.txt b/Tests/RunCMake/CompilerLauncher/CXX-env-launch-Build-stdout.txt deleted file mode 100644 index 3313e31..0000000 --- a/Tests/RunCMake/CompilerLauncher/CXX-env-launch-Build-stdout.txt +++ /dev/null @@ -1 +0,0 @@ -.*-E env USED_LAUNCHER=1.* diff --git a/Tests/RunCMake/CompilerLauncher/CXX-launch-env-Build-stdout.txt b/Tests/RunCMake/CompilerLauncher/CXX-launch-env-Build-stdout.txt new file mode 100644 index 0000000..3313e31 --- /dev/null +++ b/Tests/RunCMake/CompilerLauncher/CXX-launch-env-Build-stdout.txt @@ -0,0 +1 @@ +.*-E env USED_LAUNCHER=1.* diff --git a/Tests/RunCMake/CompilerLauncher/Fortran-env-launch-Build-stdout.txt b/Tests/RunCMake/CompilerLauncher/Fortran-env-launch-Build-stdout.txt deleted file mode 100644 index 3313e31..0000000 --- a/Tests/RunCMake/CompilerLauncher/Fortran-env-launch-Build-stdout.txt +++ /dev/null @@ -1 +0,0 @@ -.*-E env USED_LAUNCHER=1.* diff --git a/Tests/RunCMake/CompilerLauncher/Fortran-launch-env-Build-stdout.txt b/Tests/RunCMake/CompilerLauncher/Fortran-launch-env-Build-stdout.txt new file mode 100644 index 0000000..3313e31 --- /dev/null +++ b/Tests/RunCMake/CompilerLauncher/Fortran-launch-env-Build-stdout.txt @@ -0,0 +1 @@ +.*-E env USED_LAUNCHER=1.* diff --git a/Tests/RunCMake/CompilerLauncher/ISPC-env-launch-Build-stdout.txt b/Tests/RunCMake/CompilerLauncher/ISPC-env-launch-Build-stdout.txt deleted file mode 100644 index 3313e31..0000000 --- a/Tests/RunCMake/CompilerLauncher/ISPC-env-launch-Build-stdout.txt +++ /dev/null @@ -1 +0,0 @@ -.*-E env USED_LAUNCHER=1.* diff --git a/Tests/RunCMake/CompilerLauncher/ISPC-launch-env-Build-stdout.txt b/Tests/RunCMake/CompilerLauncher/ISPC-launch-env-Build-stdout.txt new file mode 100644 index 0000000..3313e31 --- /dev/null +++ b/Tests/RunCMake/CompilerLauncher/ISPC-launch-env-Build-stdout.txt @@ -0,0 +1 @@ +.*-E env USED_LAUNCHER=1.* diff --git a/Tests/RunCMake/CompilerLauncher/RunCMakeTest.cmake b/Tests/RunCMake/CompilerLauncher/RunCMakeTest.cmake index 293d711..787282a 100644 --- a/Tests/RunCMake/CompilerLauncher/RunCMakeTest.cmake +++ b/Tests/RunCMake/CompilerLauncher/RunCMakeTest.cmake @@ -1,7 +1,7 @@ include(RunCMake) function(run_compiler_launcher lang) - # Use a single build tree for tests without cleaning. + # Preserve build tree so we can reuse it for the ${lang}-Build subtest below set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/${lang}-build) set(RunCMake_TEST_NO_CLEAN 1) file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}") -- cgit v0.12