Skip to content

Commit dd949a9

Browse files
bdbaddogbdbaddog
authored
Merge pull request SCons#4544 from bdbaddog/win32_test_speedup
[WIP] Win32 test speedup
2 parents 4818f19 + 0bf264e commit dd949a9

File tree

139 files changed

+8901
-8932
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

139 files changed

+8901
-8932
lines changed

‎test/AR/AR.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#!/usr/bin/env python
22
#
3-
# __COPYRIGHT__
3+
# MIT License
4+
#
5+
# Copyright The SCons Foundation
46
#
57
# Permission is hereby granted, free of charge, to any person obtaining
68
# a copy of this software and associated documentation files (the
@@ -20,9 +22,6 @@
2022
# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
2123
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
2224
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
23-
#
24-
25-
__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
2625

2726

2827
import TestSCons
@@ -35,6 +34,7 @@
3534
test.file_fixture('wrapper.py')
3635

3736
test.write('SConstruct', """
37+
DefaultEnvironment(tools=[])
3838
foo = Environment(LIBS = ['foo'], LIBPATH = ['.'])
3939
ar = foo.Dictionary('AR')
4040
bar = Environment(LIBS = ['bar'], LIBPATH = ['.'], AR = r'%(_python_)s wrapper.py ' + ar)

‎test/AR/ARCOM.py

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,64 @@
1-
#!/usr/bin/env python
2-
#
3-
# __COPYRIGHT__
4-
#
5-
# Permission is hereby granted, free of charge, to any person obtaining
6-
# a copy of this software and associated documentation files (the
7-
# "Software"), to deal in the Software without restriction, including
8-
# without limitation the rights to use, copy, modify, merge, publish,
9-
# distribute, sublicense, and/or sell copies of the Software, and to
10-
# permit persons to whom the Software is furnished to do so, subject to
11-
# the following conditions:
12-
#
13-
# The above copyright notice and this permission notice shall be included
14-
# in all copies or substantial portions of the Software.
15-
#
16-
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
17-
# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
18-
# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
19-
# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
20-
# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
21-
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
22-
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
23-
#
24-
25-
__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
26-
27-
"""
28-
Test the ability to configure the $ARCOM construction variable.
29-
"""
30-
31-
import TestSCons
32-
33-
_python_ = TestSCons._python_
34-
35-
test = TestSCons.TestSCons()
36-
37-
test.file_fixture('mycompile.py')
38-
test.file_fixture('myrewrite.py')
39-
40-
test.write('SConstruct', """
41-
env = Environment(tools=['default', 'ar'],
42-
ARCOM = r'%(_python_)s mycompile.py ar $TARGET $SOURCES',
43-
RANLIB = True,
44-
RANLIBCOM = r'%(_python_)s myrewrite.py ranlib $TARGET',
45-
LIBPREFIX = '',
46-
LIBSUFFIX = '.lib')
47-
env.Library(target = 'output', source = ['file.1', 'file.2'])
48-
""" % locals())
49-
50-
test.write('file.1', "file.1\n/*ar*/\n/*ranlib*/\n")
51-
test.write('file.2', "file.2\n/*ar*/\n/*ranlib*/\n")
52-
53-
54-
test.run(arguments = '.')
55-
56-
test.must_match('output.lib', "file.1\nfile.2\n")
57-
58-
test.pass_test()
59-
60-
# Local Variables:
61-
# tab-width:4
62-
# indent-tabs-mode:nil
63-
# End:
64-
# vim: set expandtab tabstop=4 shiftwidth=4:
1+
#!/usr/bin/env python
2+
#
3+
# MIT License
4+
#
5+
# Copyright The SCons Foundation
6+
#
7+
# Permission is hereby granted, free of charge, to any person obtaining
8+
# a copy of this software and associated documentation files (the
9+
# "Software"), to deal in the Software without restriction, including
10+
# without limitation the rights to use, copy, modify, merge, publish,
11+
# distribute, sublicense, and/or sell copies of the Software, and to
12+
# permit persons to whom the Software is furnished to do so, subject to
13+
# the following conditions:
14+
#
15+
# The above copyright notice and this permission notice shall be included
16+
# in all copies or substantial portions of the Software.
17+
#
18+
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
19+
# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
20+
# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
21+
# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
22+
# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
23+
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
24+
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
25+
26+
"""
27+
Test the ability to configure the $ARCOM construction variable.
28+
"""
29+
30+
import TestSCons
31+
32+
_python_ = TestSCons._python_
33+
34+
test = TestSCons.TestSCons()
35+
36+
test.file_fixture('mycompile.py')
37+
test.file_fixture('myrewrite.py')
38+
39+
test.write('SConstruct', """
40+
DefaultEnvironment(tools=[])
41+
env = Environment(tools=['default', 'ar'],
42+
ARCOM = r'%(_python_)s mycompile.py ar $TARGET $SOURCES',
43+
RANLIB = True,
44+
RANLIBCOM = r'%(_python_)s myrewrite.py ranlib $TARGET',
45+
LIBPREFIX = '',
46+
LIBSUFFIX = '.lib')
47+
env.Library(target = 'output', source = ['file.1', 'file.2'])
48+
""" % locals())
49+
50+
test.write('file.1', "file.1\n/*ar*/\n/*ranlib*/\n")
51+
test.write('file.2', "file.2\n/*ar*/\n/*ranlib*/\n")
52+
53+
54+
test.run(arguments = '.')
55+
56+
test.must_match('output.lib', "file.1\nfile.2\n")
57+
58+
test.pass_test()
59+
60+
# Local Variables:
61+
# tab-width:4
62+
# indent-tabs-mode:nil
63+
# End:
64+
# vim: set expandtab tabstop=4 shiftwidth=4:

‎test/AR/ARCOMSTR.py

Lines changed: 67 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,67 @@
1-
#!/usr/bin/env python
2-
#
3-
# __COPYRIGHT__
4-
#
5-
# Permission is hereby granted, free of charge, to any person obtaining
6-
# a copy of this software and associated documentation files (the
7-
# "Software"), to deal in the Software without restriction, including
8-
# without limitation the rights to use, copy, modify, merge, publish,
9-
# distribute, sublicense, and/or sell copies of the Software, and to
10-
# permit persons to whom the Software is furnished to do so, subject to
11-
# the following conditions:
12-
#
13-
# The above copyright notice and this permission notice shall be included
14-
# in all copies or substantial portions of the Software.
15-
#
16-
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
17-
# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
18-
# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
19-
# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
20-
# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
21-
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
22-
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
23-
#
24-
25-
__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
26-
27-
"""
28-
Test that the $ARCOMSTR construction variable allows you to customize
29-
the displayed archiver string.
30-
"""
31-
32-
import TestSCons
33-
34-
_python_ = TestSCons._python_
35-
36-
test = TestSCons.TestSCons()
37-
38-
test.file_fixture('mycompile.py')
39-
test.file_fixture('myrewrite.py')
40-
41-
test.write('SConstruct', """
42-
env = Environment(tools=['default', 'ar'],
43-
ARCOM = r'%(_python_)s mycompile.py ar $TARGET $SOURCES',
44-
ARCOMSTR = 'Archiving $TARGET from $SOURCES',
45-
RANLIB = True,
46-
RANLIBCOM = r'%(_python_)s myrewrite.py ranlib $TARGET',
47-
LIBPREFIX = '',
48-
LIBSUFFIX = '.lib')
49-
env.Library(target = 'output', source = ['file.1', 'file.2'])
50-
""" % locals())
51-
52-
test.write('file.1', "file.1\n/*ar*/\n/*ranlib*/\n")
53-
test.write('file.2', "file.2\n/*ar*/\n/*ranlib*/\n")
54-
55-
test.run()
56-
57-
expect = 'Archiving output.lib from file.1 file.2'
58-
test.must_contain_all_lines(test.stdout(), [expect])
59-
test.must_match('output.lib', "file.1\nfile.2\n")
60-
61-
test.pass_test()
62-
63-
# Local Variables:
64-
# tab-width:4
65-
# indent-tabs-mode:nil
66-
# End:
67-
# vim: set expandtab tabstop=4 shiftwidth=4:
1+
#!/usr/bin/env python
2+
#
3+
# MIT License
4+
#
5+
# Copyright The SCons Foundation
6+
#
7+
# Permission is hereby granted, free of charge, to any person obtaining
8+
# a copy of this software and associated documentation files (the
9+
# "Software"), to deal in the Software without restriction, including
10+
# without limitation the rights to use, copy, modify, merge, publish,
11+
# distribute, sublicense, and/or sell copies of the Software, and to
12+
# permit persons to whom the Software is furnished to do so, subject to
13+
# the following conditions:
14+
#
15+
# The above copyright notice and this permission notice shall be included
16+
# in all copies or substantial portions of the Software.
17+
#
18+
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
19+
# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
20+
# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
21+
# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
22+
# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
23+
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
24+
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
25+
26+
"""
27+
Test that the $ARCOMSTR construction variable allows you to customize
28+
the displayed archiver string.
29+
"""
30+
31+
import TestSCons
32+
33+
_python_ = TestSCons._python_
34+
35+
test = TestSCons.TestSCons()
36+
37+
test.file_fixture('mycompile.py')
38+
test.file_fixture('myrewrite.py')
39+
40+
test.write('SConstruct', """
41+
DefaultEnvironment(tools=[])
42+
env = Environment(tools=['default', 'ar'],
43+
ARCOM = r'%(_python_)s mycompile.py ar $TARGET $SOURCES',
44+
ARCOMSTR = 'Archiving $TARGET from $SOURCES',
45+
RANLIB = True,
46+
RANLIBCOM = r'%(_python_)s myrewrite.py ranlib $TARGET',
47+
LIBPREFIX = '',
48+
LIBSUFFIX = '.lib')
49+
env.Library(target = 'output', source = ['file.1', 'file.2'])
50+
""" % locals())
51+
52+
test.write('file.1', "file.1\n/*ar*/\n/*ranlib*/\n")
53+
test.write('file.2', "file.2\n/*ar*/\n/*ranlib*/\n")
54+
55+
test.run()
56+
57+
expect = 'Archiving output.lib from file.1 file.2'
58+
test.must_contain_all_lines(test.stdout(), [expect])
59+
test.must_match('output.lib', "file.1\nfile.2\n")
60+
61+
test.pass_test()
62+
63+
# Local Variables:
64+
# tab-width:4
65+
# indent-tabs-mode:nil
66+
# End:
67+
# vim: set expandtab tabstop=4 shiftwidth=4:

‎test/AR/ARFLAGS.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#!/usr/bin/env python
22
#
3-
# __COPYRIGHT__
3+
# MIT License
4+
#
5+
# Copyright The SCons Foundation
46
#
57
# Permission is hereby granted, free of charge, to any person obtaining
68
# a copy of this software and associated documentation files (the
@@ -20,9 +22,6 @@
2022
# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
2123
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
2224
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
23-
#
24-
25-
__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
2625

2726

2827
import TestSCons
@@ -35,6 +34,7 @@
3534
test.file_fixture('wrapper.py')
3635

3736
test.write('SConstruct', """
37+
DefaultEnvironment(tools=[])
3838
foo = Environment(LIBS = ['foo'], LIBPATH = ['.'])
3939
bar = Environment(LIBS = ['bar'], LIBPATH = ['.'],
4040
AR = '', ARFLAGS = foo.subst(r'%(_python_)s wrapper.py $AR $ARFLAGS'))

‎test/AS/AS.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#!/usr/bin/env python
22
#
3-
# __COPYRIGHT__
3+
# MIT License
4+
#
5+
# Copyright The SCons Foundation
46
#
57
# Permission is hereby granted, free of charge, to any person obtaining
68
# a copy of this software and associated documentation files (the
@@ -20,9 +22,6 @@
2022
# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
2123
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
2224
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
23-
#
24-
25-
__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
2625

2726
"""
2827
Verify the ability to set the $AS construction variable to a different
@@ -41,7 +40,9 @@
4140
test.file_fixture(['fixture', 'myas.py'])
4241

4342
test.write('SConstruct', """
44-
env = Environment(LINK = r'%(_python_)s mylink.py',
43+
DefaultEnvironment(tools=[])
44+
env = Environment(tools=['link','as','gcc'],
45+
LINK = r'%(_python_)s mylink.py',
4546
AS = r'%(_python_)s myas.py',
4647
CC = r'%(_python_)s myas.py')
4748
env.Program(target = 'test1', source = 'test1.s')

0 commit comments

Comments
 (0)