From 4ed4e4760bdacad78350675006677340cebb4a29 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Sun, 5 Feb 2006 13:58:06 +0000
Subject: [PATCH] Tidy up functional/hash's Jamfile a little.

[SVN r32577]
---
 test/Jamfile | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/test/Jamfile b/test/Jamfile
index 6887f82..42fcba8 100644
--- a/test/Jamfile
+++ b/test/Jamfile
@@ -10,21 +10,12 @@ import testing ;
 
 DEPENDS all : test ;
 
-rule hash-test ( name + )
-{
+rule hash-test ( names + : extras * )
     return [
-        run $(name).cpp
+        run $(names).cpp
         <lib>../../../test/build/boost_unit_test_framework
-        : : : <include>$(BOOST_ROOT)
-        ] ;
-}
-
-rule hash-test-output ( name + )
-{
-    return [
-        run $(name).cpp
-        <lib>../../../test/build/boost_unit_test_framework
-        : : : <include>$(BOOST_ROOT) <test-info>always_show_run_output
+        : : : <include>$(BOOST_ROOT) $(extras)
+        : $(names[1])
         ] ;
 }
 
@@ -34,7 +25,7 @@ rule hash-test-output ( name + )
             [ hash-test hash_number_test ]
             [ hash-test hash_pointer_test ]
             [ hash-test hash_function_pointer_test ]
-            [ hash-test-output hash_float_test ]
+            [ hash-test hash_float_test : <test-info>always_show_run_output ]
             [ hash-test hash_string_test ]
             [ hash-test hash_range_test ]
             [ hash-test hash_custom_test ]
@@ -45,10 +36,9 @@ rule hash-test-output ( name + )
             [ hash-test hash_deque_test ]
             [ hash-test hash_set_test ]
             [ hash-test hash_map_test ]
-            [ run link_test.cpp link_test_2.cpp : : : <include>$(BOOST_ROOT) ]
+            [ hash-test link_test link_test_2 ]
             [ run container_fwd_test.cpp : : : <include>$(BOOST_ROOT) ]
         ;
 }
 
 subinclude libs/functional/hash/examples ;
-