Skip to content

Commit 849445c

Browse files
authored
Merge pull request swiftlang#32 from apple/revert-31-repllinuxintegr
Revert "[REPL] Test RPATH is set correctly on linux."
2 parents e3e1955 + c6ad2f1 commit 849445c

File tree

2 files changed

+0
-12
lines changed

2 files changed

+0
-12
lines changed

lit.cfg

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -169,11 +169,6 @@ lldb_path = lit_config.params.get(
169169
"lldb",
170170
os.path.join(package_path, "usr", "bin", "lldb"))
171171
lit_config.note("testing using 'lldb': {}".format(lldb_path))
172-
173-
repl_swift_dummy_path = lit_config.params.get(
174-
"repl_swift",
175-
os.path.join(package_path, "usr", "bin", "repl_swift"))
176-
lit_config.note("testing using 'repl_swift': {}".format(repl_swift_dummy_path))
177172

178173
# Verify they exist.
179174
if not os.path.exists(swift_path):
@@ -187,15 +182,12 @@ if not os.path.exists(lldb_path):
187182
lldb_path = subprocess.check_output(["xcrun", "--find", "lldb"]).strip()
188183
else:
189184
lit_config.fatal("lldb does not exist!")
190-
if not os.path.exists(repl_swift_dummy_path):
191-
lit_config.fatal("repl_swift does not exist!")
192185

193186
# Define our supported substitutions.
194187
config.substitutions.append( ('%{package_path}', package_path) )
195188
config.substitutions.append( ('%{python}', sys.executable) )
196189
config.substitutions.append( ('%{not}', os.path.join(srcroot, "not")) )
197190
config.substitutions.append( ('%{lldb}', lldb_path) )
198-
config.substitutions.append( ('%{repl_swift}', repl_swift_dummy_path) )
199191
config.substitutions.append( ('%{swift}', swift_path) )
200192
config.substitutions.append( ('%{swiftc}', swiftc_path) )
201193
config.substitutions.append( ('%{FileCheck}', filecheck_path) )

test-rpath-linux-repl/test-rpath-linux-repl.py

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)