| Index: test/variables/filelist/gyptest-filelist.py
|
| ===================================================================
|
| --- test/variables/filelist/gyptest-filelist.py (revision 1758)
|
| +++ test/variables/filelist/gyptest-filelist.py (working copy)
|
| @@ -13,38 +13,15 @@
|
|
|
| import TestGyp
|
|
|
| -test = TestGyp.TestGyp(format='gypd')
|
| +test = TestGyp.TestGyp()
|
|
|
| -expect = test.read('filelist.gyp.stdout')
|
| -if sys.platform == 'win32':
|
| - expect = expect.replace('/', r'\\').replace('\r\n', '\n')
|
| +CHDIR = 'src'
|
| +test.run_gyp('filelist2.gyp', chdir=CHDIR)
|
|
|
| -test.run_gyp('src/filelist.gyp',
|
| - '--debug', 'variables',
|
| - stdout=expect, ignore_line_numbers=True)
|
| -
|
| -# Verify the filelist.gypd against the checked-in expected contents.
|
| -#
|
| -# Normally, we should canonicalize line endings in the expected
|
| -# contents file setting the Subversion svn:eol-style to native,
|
| -# but that would still fail if multiple systems are sharing a single
|
| -# workspace on a network-mounted file system. Consequently, we
|
| -# massage the Windows line endings ('\r\n') in the output to the
|
| -# checked-in UNIX endings ('\n').
|
| -
|
| -contents = test.read('src/filelist.gypd').replace(
|
| - '\r', '').replace('\\\\', '/')
|
| -expect = test.read('filelist.gypd.golden').replace('\r', '')
|
| -if not test.match(contents, expect):
|
| - print "Unexpected contents of `src/filelist.gypd'"
|
| - test.diff(expect, contents, 'src/filelist.gypd ')
|
| - test.fail_test()
|
| -
|
| -contents = test.read('src/names.txt')
|
| +test.build('filelist2.gyp', 'foo', chdir=CHDIR)
|
| +contents = test.read('src/dummy_foo').replace('\r', '')
|
| expect = 'John\nJacob\nJingleheimer\nSchmidt\n'
|
| if not test.match(contents, expect):
|
| - print "Unexpected contents of `src/names.txt'"
|
| - test.diff(expect, contents, 'src/names.txt ')
|
| + print "Unexpected contents of `src/dummy_foo'"
|
| + test.diff(expect, contents, 'src/dummy_foo')
|
| test.fail_test()
|
| -
|
| -test.pass_test()
|
|
|