summaryrefslogtreecommitdiffstats
path: root/test/Options
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2008-03-31 19:49:37 (GMT)
committerSteven Knight <knight@baldmt.com>2008-03-31 19:49:37 (GMT)
commit3aaaa6c6344cf81eeab0f1b19ae96391dac3bfd2 (patch)
treeed8516e05c6e335415c8993f18f5c98b1458dc69 /test/Options
parent8a201fe36c6b3ee53892b43efd2a21e967a5fc19 (diff)
downloadSCons-3aaaa6c6344cf81eeab0f1b19ae96391dac3bfd2.zip
SCons-3aaaa6c6344cf81eeab0f1b19ae96391dac3bfd2.tar.gz
SCons-3aaaa6c6344cf81eeab0f1b19ae96391dac3bfd2.tar.bz2
Merged revisions 2720-2724 via svnmerge from
http://scons.tigris.org/svn/scons/branches/core ........ r2722 | stevenknight | 2008-03-31 11:51:25 -0700 (Mon, 31 Mar 2008) | 2 lines Update the copyright year. ........ r2723 | stevenknight | 2008-03-31 11:56:25 -0700 (Mon, 31 Mar 2008) | 2 lines Windows portability fixes in tests (mostly with absolute path handling). ........ r2724 | stevenknight | 2008-03-31 12:44:37 -0700 (Mon, 31 Mar 2008) | 2 lines Update publication month (way out of date). ........
Diffstat (limited to 'test/Options')
-rw-r--r--test/Options/ListOption.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/Options/ListOption.py b/test/Options/ListOption.py
index 3a95b8a..5611e40 100644
--- a/test/Options/ListOption.py
+++ b/test/Options/ListOption.py
@@ -28,6 +28,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
Test the ListOption canned Option type.
"""
+import os
import os.path
import string
@@ -79,7 +80,7 @@ test.run()
check(['all', '1', 'gl ical qt x11', 'gl ical qt x11',
"['gl ical qt x11']"])
-test.must_match(test.workpath('scons.options'), "shared = 'all'\n")
+test.must_match(test.workpath('scons.options'), "shared = 'all'"+os.linesep)
check(['all', '1', 'gl ical qt x11', 'gl ical qt x11',
"['gl ical qt x11']"])