Skip to content

Commit e267014

Browse files
committed
flangrt to flang_rt in Python code
1 parent d91ea5f commit e267014

File tree

6 files changed

+17
-17
lines changed

6 files changed

+17
-17
lines changed

flang-rt/test/NonGtestUnit/lit.cfg.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
# test_exec_root: The root path where tests should be run.
1818
# lit writes a '.lit_test_times.txt' file into this directory.
19-
config.test_exec_root = config.flangrt_binary_test_dir
19+
config.test_exec_root = config.flang_rt_binary_test_dir
2020

2121
# testFormat: The test format to use to interpret tests.
2222
config.test_format = lit.formats.ExecutableTest()

flang-rt/test/NonGtestUnit/lit.site.cfg.py.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
import os
44

55
config.llvm_tools_dir = "@LLVM_TOOLS_DIR@"
6-
config.flangrt_source_dir = "@FLANG_RT_SOURCE_DIR@"
6+
config.flang_rt_source_dir = "@FLANG_RT_SOURCE_DIR@"
77
config.flangrt_binary_dir = "@FLANG_RT_BINARY_DIR@"
8-
config.flangrt_binary_test_dir = os.path.dirname(__file__)
8+
config.flang_rt_binary_test_dir = os.path.dirname(__file__)
99

1010
import lit.llvm
1111
lit.llvm.initialize(lit_config, config)
1212

1313
# Let the main config do the real work.
14-
lit_config.load_config(config, os.path.join(config.flangrt_source_dir, 'test', 'NonGtestUnit', 'lit.cfg.py'))
14+
lit_config.load_config(config, os.path.join(config.flang_rt_source_dir, 'test', 'NonGtestUnit', 'lit.cfg.py'))

flang-rt/test/Unit/lit.cfg.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
# test_exec_root: The root path where tests should be run.
1717
# lit writes a '.lit_test_times.txt' file into this directory.
18-
config.test_exec_root = config.flangrt_binary_test_dir
18+
config.test_exec_root = config.flang_rt_binary_test_dir
1919

2020
# testFormat: The test format to use to interpret tests.
2121
config.test_format = lit.formats.GoogleTest(config.llvm_build_mode, "Tests")

flang-rt/test/Unit/lit.site.cfg.py.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import os
44

55
config.llvm_tools_dir = "@LLVM_TOOLS_DIR@"
66
config.llvm_build_mode = "@LLVM_BUILD_MODE@"
7-
config.flangrt_source_dir = "@FLANG_RT_SOURCE_DIR@"
7+
config.flang_rt_source_dir = "@FLANG_RT_SOURCE_DIR@"
88
config.flangrt_binary_dir = "@FLANG_RT_BINARY_DIR@"
9-
config.flangrt_binary_test_dir = os.path.dirname(__file__)
9+
config.flang_rt_binary_test_dir = os.path.dirname(__file__)
1010

1111
import lit.llvm
1212
lit.llvm.initialize(lit_config, config)
1313

1414
# Let the main config do the real work.
15-
lit_config.load_config(config, os.path.join(config.flangrt_source_dir, 'test', 'Unit', 'lit.cfg.py'))
15+
lit_config.load_config(config, os.path.join(config.flang_rt_source_dir, 'test', 'Unit', 'lit.cfg.py'))

flang-rt/test/lit.cfg.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ def shjoin(args, sep=' '):
5858

5959
# test_exec_root: The root path where tests should be run.
6060
# lit writes a '.lit_test_times.txt' file into this directory.
61-
config.test_exec_root = config.flangrt_binary_test_dir
61+
config.test_exec_root = config.flang_rt_binary_test_dir
6262

6363
# On MacOS, -isysroot is needed to build binaries.
6464
isysroot_flag = []
@@ -90,17 +90,17 @@ def shjoin(args, sep=' '):
9090
llvm_config.with_environment("PATH", config.llvm_tools_dir, append_path=True)
9191

9292
# Library path of libflang_rt.a
93-
config.substitutions.append(("%libdir", config.flangrt_build_lib_dir))
93+
config.substitutions.append(("%libdir", config.flang_rt_build_lib_dir))
9494

9595
# Define some variables to help us test that the flang runtime doesn't depend on
9696
# the C++ runtime libraries. For this we need a C compiler.
97-
libruntime = os.path.join(config.flangrt_build_lib_dir, "libflang_rt.a")
97+
libruntime = os.path.join(config.flang_rt_build_lib_dir, "libflang_rt.a")
9898
include = os.path.join(config.flang_source_dir, "include")
9999
config.substitutions.append(("%libruntime", libruntime))
100100
config.substitutions.append(("%include", include))
101101

102102
# Additional library depedendencies the that flang driver does not add itself.
103103
deplibs = []
104-
if config.flangrt_experimental_offload_support == "CUDA":
104+
if config.flang_rt_experimental_offload_support == "CUDA":
105105
deplibs.append('-lcudart')
106106
config.substitutions.append(("%deplibs", shjoin(deplibs)))

flang-rt/test/lit.site.cfg.py.in

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ import sys
44

55
config.llvm_tools_dir = "@LLVM_TOOLS_DIR@"
66
config.flang_source_dir = "@FLANG_SOURCE_DIR@"
7-
config.flangrt_source_dir = "@FLANG_RT_SOURCE_DIR@"
8-
config.flangrt_binary_test_dir = os.path.dirname(__file__)
9-
config.flangrt_build_lib_dir = "@FLANG_RT_BUILD_LIB_DIR@"
10-
config.flangrt_experimental_offload_support = "@FLANG_RT_EXPERIMENTAL_OFFLOAD_SUPPORT@"
7+
config.flang_rt_source_dir = "@FLANG_RT_SOURCE_DIR@"
8+
config.flang_rt_binary_test_dir = os.path.dirname(__file__)
9+
config.flang_rt_build_lib_dir = "@FLANG_RT_BUILD_LIB_DIR@"
10+
config.flang_rt_experimental_offload_support = "@FLANG_RT_EXPERIMENTAL_OFFLOAD_SUPPORT@"
1111
config.cc = "@CMAKE_C_COMPILER@"
1212
config.osx_sysroot = path(r"@CMAKE_OSX_SYSROOT@")
1313

1414
import lit.llvm
1515
lit.llvm.initialize(lit_config, config)
1616

1717
# Let the main config do the real work.
18-
lit_config.load_config(config, os.path.join(config.flangrt_source_dir, 'test', 'lit.cfg.py'))
18+
lit_config.load_config(config, os.path.join(config.flang_rt_source_dir, 'test', 'lit.cfg.py'))

0 commit comments

Comments
 (0)