Skip to content

Commit 840b94d

Browse files
committed
[libc++] Rename libstdc++ test parameters to allow setting them in LIBCXX_TEST_PARAMS
1 parent a87215b commit 840b94d

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

libcxx/test/configs/stdlib-libstdc++.cfg.in

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
#
22
# This testing configuration runs the test suite using the libstdc++ Standard library.
33
#
4-
# The additional '--param libstdcxx-install-prefix=<PATH>', '--param libstdcxx-triple=<TRIPLE>' and
5-
# '--param libstdcxx-version=<VERSION>' lit parameters must be provided when invoking lit for the
4+
# The additional '--param libstdcxx_install_prefix=<PATH>', '--param libstdcxx_triple=<TRIPLE>' and
5+
# '--param libstdcxx_version=<VERSION>' lit parameters must be provided when invoking lit for the
66
# configuration to find the appropriate headers and library.
77
#
88
# For example:
99
#
10-
# $ ./libcxx/utils/libcxx-lit <BUILD> -sv libcxx/test/std --param libstdcxx-install-prefix=/opt/homebrew/Cellar/gcc/14.1.0_1 \
11-
# --param libstdcxx-version=14 \
12-
# --param libstdcxx-triple=aarch64-apple-darwin22
10+
# $ ./libcxx/utils/libcxx-lit <BUILD> -sv libcxx/test/std --param libstdcxx_install_prefix=/opt/homebrew/Cellar/gcc/14.1.0_1 \
11+
# --param libstdcxx_version=14 \
12+
# --param libstdcxx_triple=aarch64-apple-darwin22
1313
#
1414

1515
lit_config.load_config(config, '@CMAKE_CURRENT_BINARY_DIR@/cmake-bridge.cfg')
@@ -20,19 +20,19 @@ import libcxx.test.params, libcxx.test.config, libcxx.test.dsl
2020

2121
# Additional parameters for libstdc++
2222
LIBSTDCXX_PARAMETERS = [
23-
libcxx.test.dsl.Parameter(name='libstdcxx-install-prefix', type=str,
23+
libcxx.test.dsl.Parameter(name='libstdcxx_install_prefix', type=str,
2424
actions=lambda path: [libcxx.test.dsl.AddSubstitution('%{libstdcxx-install-prefix}', path)],
2525
help="""
2626
The installation prefix where libstdc++ was installed. This is used to find the libstdc++ headers,
2727
link against its built library, etc.
2828
"""),
29-
libcxx.test.dsl.Parameter(name='libstdcxx-triple', type=str,
29+
libcxx.test.dsl.Parameter(name='libstdcxx_triple', type=str,
3030
actions=lambda triple: [libcxx.test.dsl.AddSubstitution('%{libstdcxx-triple}', triple)],
3131
help="""
3232
The target triple used for the target-specific include directory of libstdc++. This is used to find the
3333
libstdc++ headers.
3434
"""),
35-
libcxx.test.dsl.Parameter(name='libstdcxx-version', type=str,
35+
libcxx.test.dsl.Parameter(name='libstdcxx_version', type=str,
3636
actions=lambda version: [libcxx.test.dsl.AddSubstitution('%{libstdcxx-version}', version)],
3737
help="""
3838
The version of libstdc++. This is used to find the libstdc++ headers and library.

0 commit comments

Comments
 (0)