aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-11-22 13:15:24 -0800
committerAlon Zakai <alonzakai@gmail.com>2013-11-22 13:15:24 -0800
commita07019e048690542f8658877a0befb0799edee5d (patch)
treebf205316c76d443e0e91bda4ce59cb31c1fe641e
parent89bfa7337a7456a6b703cefa632d55dff4c3ad8e (diff)
parent0cd1cc8bb31a005f8addea7a3082280327ea5ba3 (diff)
Merge pull request #1850 from juj/fix_test_dependency_file_windows
Fix other.test_dependency_file on Windows.
-rw-r--r--tests/test_other.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/test_other.py b/tests/test_other.py
index d1230c66..5a76bf6a 100644
--- a/tests/test_other.py
+++ b/tests/test_other.py
@@ -2126,7 +2126,8 @@ int main()
assert os.path.exists(os.path.join(self.get_dir(), 'test.d')), 'No dependency file generated'
deps = open(os.path.join(self.get_dir(), 'test.d')).read()
- head, tail = deps.split( ':', 2 )
+ # Look for ': ' instead of just ':' to not confuse C:\path\ notation with make "target: deps" rule. Not perfect, but good enough for this test.
+ head, tail = deps.split(': ', 2)
assert 'test.o' in head, 'Invalid dependency target'
assert 'test.cpp' in tail and 'test.hpp' in tail, 'Invalid dependencies generated'