summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2004-02-08 16:02:26 (GMT)
committerSteven Knight <knight@baldmt.com>2004-02-08 16:02:26 (GMT)
commitcfd0199a2ec09af66a61ed36f9a2ba62561ee808 (patch)
tree076e17c78eb2d5b7f7a9d5301143879027bea360
parent9193f1e90dab322589f26cea54fc94c7ba70e4f2 (diff)
downloadSCons-cfd0199a2ec09af66a61ed36f9a2ba62561ee808.zip
SCons-cfd0199a2ec09af66a61ed36f9a2ba62561ee808.tar.gz
SCons-cfd0199a2ec09af66a61ed36f9a2ba62561ee808.tar.bz2
Updated test for C++ files in libraries. (Chad Austin)
-rw-r--r--test/Library.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/test/Library.py b/test/Library.py
index 2011b72..76047b8 100644
--- a/test/Library.py
+++ b/test/Library.py
@@ -33,7 +33,7 @@ env = Environment(LIBS = [ 'foo1', 'libfoo2' ],
LIBPATH = [ '.' ])
env.Library(target = 'foo1', source = 'f1.c')
Library(target = 'libfoo2', source = Split('f2a.c f2b.c f2c.c'))
-libtgt=env.Library(target = 'foo3', source = ['f3a.c', 'f3b.c', 'f3c.c'])
+libtgt=env.Library(target = 'foo3', source = ['f3a.c', 'f3b.c', 'f3c.cpp'])
env.Program(target = 'prog', source = [ 'prog.c', libtgt ])
""")
@@ -85,11 +85,12 @@ f3b(void)
}
""")
-test.write('f3c.c', r"""
-void
+test.write('f3c.cpp', r"""
+#include <stdio.h>
+extern "C" void
f3c(void)
{
- printf("f3c.c\n");
+ printf("f3c.cpp\n");
}
""")
@@ -120,6 +121,6 @@ main(int argc, char *argv[])
test.run(arguments = '.')
test.run(program = test.workpath('prog'),
- stdout = "f1.c\nf2a.c\nf2b.c\nf2c.c\nf3a.c\nf3b.c\nf3c.c\nprog.c\n")
+ stdout = "f1.c\nf2a.c\nf2b.c\nf2c.c\nf3a.c\nf3b.c\nf3c.cpp\nprog.c\n")
test.pass_test()