|
Boost-Commit : |
From: jurko.gospodnetic_at_[hidden]
Date: 2008-05-05 15:31:48
Author: jurko
Date: 2008-05-05 15:31:47 EDT (Mon, 05 May 2008)
New Revision: 45148
URL: http://svn.boost.org/trac/boost/changeset/45148
Log:
Minor stylistic Boost Jam test cleanup.
Text files modified:
trunk/tools/jam/test/action_status.jam | 5 ++---
trunk/tools/jam/test/option_l.jam | 1 +
trunk/tools/jam/test/parallel_multifile_actions.jam | 4 +---
trunk/tools/jam/test/test.jam | 8 ++++++++
4 files changed, 12 insertions(+), 6 deletions(-)
Modified: trunk/tools/jam/test/action_status.jam
==============================================================================
--- trunk/tools/jam/test/action_status.jam (original)
+++ trunk/tools/jam/test/action_status.jam 2008-05-05 15:31:47 EDT (Mon, 05 May 2008)
@@ -15,14 +15,13 @@
}
else
{
- #~ actions .a. { $(ACTION) }
actions quietly .a. { $(ACTION) }
-
+
rule .a.
{
DEPENDS $(<) : $(>) ;
}
-
+
NOTFILE subtest ;
.a. subtest_a : subtest ;
DEPENDS all : subtest_a ;
Modified: trunk/tools/jam/test/option_l.jam
==============================================================================
--- trunk/tools/jam/test/option_l.jam (original)
+++ trunk/tools/jam/test/option_l.jam 2008-05-05 15:31:47 EDT (Mon, 05 May 2008)
@@ -5,6 +5,7 @@
if ! $(BJAM_SUBTEST)
{
ECHO --- Testing -l option... ;
+
assert "...found 2 targets...
...updating 1 target...
.a. sleeper
Modified: trunk/tools/jam/test/parallel_multifile_actions.jam
==============================================================================
--- trunk/tools/jam/test/parallel_multifile_actions.jam (original)
+++ trunk/tools/jam/test/parallel_multifile_actions.jam 2008-05-05 15:31:47 EDT (Mon, 05 May 2008)
@@ -5,6 +5,7 @@
if ! $(BJAM_SUBTEST)
{
ECHO --- Testing -jN parallel execution of multi-file actions... ;
+
assert "...found 6 targets...
...updating 4 targets...
.gen. g1.generated
@@ -41,7 +42,4 @@
NOTFILE root ;
DEPENDS g1.generated g2.generated : root ;
DEPENDS all : u1.user u2.user ;
- #~ Work around... Remove when fixed...
- #~ DEPENDS g2.generated : g1.generated ;
- #~ INCLUDES g2.generated : g1.generated ;
}
Modified: trunk/tools/jam/test/test.jam
==============================================================================
--- trunk/tools/jam/test/test.jam (original)
+++ trunk/tools/jam/test/test.jam 2008-05-05 15:31:47 EDT (Mon, 05 May 2008)
@@ -5,16 +5,21 @@
fail-count = 0 ;
pass-count = 0 ;
+
rule message ( message * )
{
local b = [ BACKTRACE ] ;
ECHO "$(b[-4]):$(b[-3]):" $(message) ;
}
+
+
rule fail ( message * )
{
fail-count = [ CALC $(fail-count) + 1 ] ;
message "error:" [FAILED] $(message) ;
}
+
+
rule pass ( message * )
{
pass-count = [ CALC $(pass-count) + 1 ] ;
@@ -23,6 +28,8 @@
message "info:" [PASSED] $(message) ;
}
}
+
+
rule assert ( expected * : test ? : obtained * )
{
test ?= "(==)" ;
@@ -41,6 +48,7 @@
}
}
+
include action_status.jam ;
include actions_quietly.jam ;
include builtin_shell.jam ;
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk