Skip to content

Commit 4ac1893

Browse files
author
Chris Matthews
committed
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. llvm-svn: 373111
1 parent 01fa414 commit 4ac1893

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

lnt/tests/test_suite.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1028,7 +1028,7 @@ def diagnose(self):
10281028
@click.option("--test-externals", "test_suite_externals",
10291029
type=click.UNPROCESSED, metavar="PATH",
10301030
help="Path to the LLVM test-suite externals")
1031-
@click.option("--cmake-define", "cmake_defines",
1031+
@click.option("-D", "--cmake-define", "cmake_defines",
10321032
multiple=True,
10331033
help="Defines to pass to cmake. These do not require the "
10341034
"-D prefix and can be given multiple times. e.g.: "

tests/runtest/test_suite-cache.shtest

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@
1212
# RUN: --use-lit %S/Inputs/test-suite-cmake/fake-lit \
1313
# RUN: --cmake-cache Release \
1414
# RUN: --cmake-define FOO=BAR \
15+
# RUN: -D BAR=BAZ \
1516
# RUN: &> %t.cmake-cache.log
1617
# RUN: FileCheck --check-prefix CHECK-CACHE < %t.cmake-cache.log %s
17-
# CHECK-CACHE: Execute: {{.*}}cmake -DCMAKE_CXX_COMPILER:FILEPATH={{.*}}/FakeCompilers/clang++-r154331 -DCMAKE_C_COMPILER:FILEPATH={{.*}}FakeCompilers/clang-r154331 -C {{.*}}/Release.cmake {{.*}}-DFOO=BAR
18+
# 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
1819

1920
# RUN: rm -rf %t.SANDBOX
2021
# Check a run of test-suite using a invalid cmake cache

0 commit comments

Comments
 (0)