Undo changes to unrelated files accidentally included in r4036.

git-svn-id: http://scons.tigris.org/svn/scons/trunk@4037 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/test/Fortran/link-with-cxx.py b/test/Fortran/link-with-cxx.py
index 8d05c5ca06ac7ae40020a0a71060aa612fa12414..a29558e5e6c557359821e0293c5ef6465c0be97b 100644 (file)
--- a/test/Fortran/link-with-cxx.py
+++ b/test/Fortran/link-with-cxx.py
@@ -70,8 +70,7 @@ def copier(target, source, env):
     s = str(source[0])
     t = str(target[0])
     open(t, 'wb').write(open(s, 'rb').read())
-env = Environment(tools = ['gcc', 'gnulink', 'fortran'],
-                  CXX = r'%(_python_)s test_linker.py',
+env = Environment(CXX = r'%(_python_)s test_linker.py',
                   CXXCOM = Action(copier),
                   SMARTLINK = SCons.Tool.link.smart_link,
                   LINK = r'$SMARTLINK',

diff --git a/test/Program/no-source.py b/test/Program/no-source.py
deleted file mode 100644 (file)
index cf12403..0000000
--- a/test/Program/no-source.py
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/usr/bin/env python
-#
-# __COPYRIGHT__
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-
-__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
-
-"""
-XXX Put a description of the test here.
-"""
-
-import TestSCons
-
-test = TestSCons.TestSCons()
-
-test.write('SConstruct', """
-env = Environment()
-env.Library('main', 'main.c')
-env.Library('one', 'one.c')
-env.Library('two', 'two.c')
-env.Program('prog', [], LIBS=['main', 'one', 'two'], LIBPATH=['.'])
-""")
-
-test.write('main.c', """\
-#include <stdio.h>
-#include <stdlib.h>
-extern void one(void);
-extern void two(void);
-int
-main(int argc, char *argv[])
-{
-    printf("main.c\\n");
-    one();
-    two();
-    exit (0);
-}
-""")
-
-test.write('one.c', """\
-#include <stdio.h>
-#include <stdlib.h>
-void
-one(void)
-{
-    printf("one.c\\n");
-}
-""")
-
-test.write('two.c', """\
-#include <stdio.h>
-#include <stdlib.h>
-void
-two(void)
-{
-    printf("two.c\\n");
-}
-""")
-
-test.run(arguments = '.')
-
-test.run(program=test.workpath('prog'), stdout="main.c\none.c\ntwo.c\n")
-
-test.pass_test()