summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTodd Fiala <todd.fiala@gmail.com>2014-04-25 21:04:48 +0000
committerTodd Fiala <todd.fiala@gmail.com>2014-04-25 21:04:48 +0000
commit6817df65f0f042a30d80ab59839a3cad980f1fd6 (patch)
treec3123e646c67d9119f15ccf6ae49be7e05cbbe9c
parent03d91c51e42853400a4ce23a6e19b640ac0702b8 (diff)
downloadbcm5719-llvm-6817df65f0f042a30d80ab59839a3cad980f1fd6.tar.gz
bcm5719-llvm-6817df65f0f042a30d80ab59839a3cad980f1fd6.zip
Modify TestSettings test for stderr.txt/stdout.txt to ignore an
optional path prior to the file base name. On Linux x86_64 (Ubuntu 12.04) I am sometimes getting a full path on the stderr.txt. This changes the test for target.error-path and target.output-path settings to ignore any optional directory before the expected file base name. llvm-svn: 207272
-rw-r--r--lldb/test/settings/TestSettings.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lldb/test/settings/TestSettings.py b/lldb/test/settings/TestSettings.py
index 42d8b7d744d..f89dda4cb74 100644
--- a/lldb/test/settings/TestSettings.py
+++ b/lldb/test/settings/TestSettings.py
@@ -290,11 +290,11 @@ class SettingsCommandTestCase(TestBase):
self.expect("settings show target.error-path",
SETTING_MSG("target.error-path"),
- startstr = 'target.error-path (file) = "stderr.txt"')
+ substrs = ['target.error-path (file) = ', 'stderr.txt"'])
self.expect("settings show target.output-path",
SETTING_MSG("target.output-path"),
- startstr = 'target.output-path (file) = "stdout.txt"')
+ substrs = ['target.output-path (file) = ', 'stdout.txt"'])
self.runCmd("run", RUN_SUCCEEDED)
OpenPOWER on IntegriCloud