Login | Register
My pages Projects Community openCollabNet

Discussions > commits > [cxxtest-commits] svn commit: r290 - trunk/test

cxxtest
Discussion topic

Back to topic list

[cxxtest-commits] svn commit: r290 - trunk/test

Author wehart
Full name William Hart
Date 2011-12-30 18:07:52 PST
Message Author: wehart
Date: 2011-12-28 11:10:10-0800
New Revision: 290

Modified:
   trunk/test/Makefile
   trunk/test/test_cxxtest.py

Log:
Cleaning up old Makefile targets.

Fixing check for available features when running under nose.


Modified: trunk/test/Makefile
Url: http://cxxtest.tigri​s.org/source/browse/​cxxtest/trunk/test/M​akefile?view=diff​&pathrev=290&r1​=289&r2=290
====================​====================​====================​==================
--- trunk/test/Makefile (original)
+++ trunk/test/Makefile 2011-12-28 11:10:10-0800
@@ -2,28 +2,9 @@
 # Some convenient ways of running the self tests
 #
 
-TEST = perl test.pl
-
 all: gcc
 
 clean:
     rm -f *p[ly].out *px *px.out *build.log *root.cpp parsetab.py *.gcno *.gcda ../cxxtest/*.gcno ../cxxtest/*.gcda ../sample/*.gcno ../sample/*.gcda Test*.cpp *.gcov *.pre rm Samples.txt
     rm -Rf *.dSYM
 
-gcc:
- $(TEST) --gcc || (diff -u pl.cpp py.cpp; cat pl.out py.out build.log px.out)
-
-gcc-2.96:
- $(TEST) --compiler='g++-2.96 -g -Wall -W -Werror -Woverloaded-virtual -Wnon-virtual-dtor -Wreorder -Wsign-promo' --no-eh-option='-fno​-exceptions' || (diff -u pl.cpp py.cpp; cat pl.out py.out build.log px.out; exit 1)
-
-gcc-2.96-bug:
- $(TEST) --compiler='g++-2.96 -g -Wall -fomit-frame-pointer' --no-eh-option='-fno​-exceptions' || (diff -u pl.cpp py.cpp; cat pl.out py.out build.log px.out; exit 1)
-
-gcc_no_python:
- $(TEST) --gcc --no-python || (cat pl.out build.log px.out; exit 1)
-
-#
-# Local Variables:
-# compile-command: "gmake gcc"
-# End:
-#

Modified: trunk/test/test_cxxtest.py
Url: http://cxxtest.tigri​s.org/source/browse/​cxxtest/trunk/test/t​est_cxxtest.py?view=​diff&pathrev=290​&r1=289&r2=2​90
====================​====================​====================​==================
--- trunk/test/test_cxxtest.py (original)
+++ trunk/test/test_cxxtest.py 2011-12-28 11:10:10-0800
@@ -35,7 +35,7 @@
 OUTPUT.close()
 
 def available(compiler, exe_option):
- cmd = "%s %s %s %s > %s 2>&1" % (compiler, exe_option, currdir+'anything', currdir+'anything.cpp', currdir+'anything.log')
+ cmd = "cd %s; %s %s %s %s > %s 2>&1" % (currdir, compiler, exe_option, currdir+'anything', currdir+'anything.cpp', currdir+'anything.log')
     ##print cmd
     status = subprocess.call(cmd, shell=True)
     flag = status == 0 and os.path.exists(currd​ir+'anything')

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

[cxxtest-commits] svn commit: r290 - trunk/test wehart William Hart 2011-12-30 18:07:52 PST
Messages per page: