[LNT] r373111 - Make the short version of --cmake-define -D

[Chris Matthews via llvm-commits]

Author: cmatthews
Date: Fri Sep 27 11:52:51 2019
New Revision: 373111

URL: http://llvm.org/viewvc/llvm-project?rev=373111&view=rev
Log:
Make the short version of --cmake-define -D

Because that is what it is in cmake as well. I think -D is
a little easier to remember if you use cmake already. -C
already matches.


Modified:
    lnt/trunk/lnt/tests/test_suite.py
    lnt/trunk/tests/runtest/test_suite-cache.shtest

Modified: lnt/trunk/lnt/tests/test_suite.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/tests/test_suite.py?rev=373111&r1=373110&r2=373111&view=diff
==============================================================================
--- lnt/trunk/lnt/tests/test_suite.py (original)
+++ lnt/trunk/lnt/tests/test_suite.py Fri Sep 27 11:52:51 2019
@@ -1028,7 +1028,7 @@ class TestSuiteTest(BuiltinTest):
 @click.option("--test-externals", "test_suite_externals",
               type=click.UNPROCESSED, metavar="PATH",
               help="Path to the LLVM test-suite externals")
- at click.option("--cmake-define", "cmake_defines",
+ at click.option("-D", "--cmake-define", "cmake_defines",
               multiple=True,
               help="Defines to pass to cmake. These do not require the "
                    "-D prefix and can be given multiple times. e.g.: "

Modified: lnt/trunk/tests/runtest/test_suite-cache.shtest
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/tests/runtest/test_suite-cache.shtest?rev=373111&r1=373110&r2=373111&view=diff
==============================================================================
--- lnt/trunk/tests/runtest/test_suite-cache.shtest (original)
+++ lnt/trunk/tests/runtest/test_suite-cache.shtest Fri Sep 27 11:52:51 2019
@@ -12,9 +12,10 @@
 # RUN:     --use-lit %S/Inputs/test-suite-cmake/fake-lit \
 # RUN:     --cmake-cache Release \
 # RUN:     --cmake-define FOO=BAR \
+# RUN:     -D BAR=BAZ \
 # RUN:     &> %t.cmake-cache.log
 # RUN: FileCheck  --check-prefix CHECK-CACHE < %t.cmake-cache.log %s
-# CHECK-CACHE: Execute: {{.*}}cmake -DCMAKE_CXX_COMPILER:FILEPATH={{.*}}/FakeCompilers/clang++-r154331 -DCMAKE_C_COMPILER:FILEPATH={{.*}}FakeCompilers/clang-r154331 -C {{.*}}/Release.cmake {{.*}}-DFOO=BAR
+# CHECK-CACHE: Execute: {{.*}}cmake -DCMAKE_CXX_COMPILER:FILEPATH={{.*}}/FakeCompilers/clang++-r154331 -DCMAKE_C_COMPILER:FILEPATH={{.*}}FakeCompilers/clang-r154331 -C {{.*}}/Release.cmake {{.*}}-DFOO=BAR{{.*}}-DBAR=BAZ
 
 # RUN: rm -rf %t.SANDBOX
 # Check a run of test-suite using a invalid cmake cache