From 2b56b3434f2484e9f80d820446ee8ca579e90d30 Mon Sep 17 00:00:00 2001
From: Vladimir Prus <ghost@cs.msu.su>
Date: Mon, 19 Sep 2005 08:49:50 +0000
Subject: [PATCH] Revive the project_test3 test.

[SVN r31035]
---
 v2/test/project-test3/lib3/Jamfile     | 17 +++++++++++++++--
 v2/test/project-test3/project-root.jam | 20 ++++++++++++++++----
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/v2/test/project-test3/lib3/Jamfile b/v2/test/project-test3/lib3/Jamfile
index b532f66d0..4cecf63ac 100644
--- a/v2/test/project-test3/lib3/Jamfile
+++ b/v2/test/project-test3/lib3/Jamfile
@@ -6,10 +6,23 @@ use-project /lib2/helper : ../lib2/helper ;
 
 import property ;
 
+rule properties-as-path ( properties * )
+{
+    local r ;
+    for local p in $(properties)
+    {
+	    if $(p:G) != <action>
+	    {
+	        r += $(p) ;
+	    }
+    }
+    return [ property.as-path
+        [ property.remove incidental : $(r) ] ] ;
+}
+
 rule mfc-compile ( target : sources * : property-set * )
 {
-    PROPERTIES on $(target) = [ 
-      property.as-path [ property.remove incidental : $(property-set) ] ] ;      
+    PROPERTIES on $(target) = [ properties-as-path $(property-set) ] ;
 }
 
 actions mfc-compile
diff --git a/v2/test/project-test3/project-root.jam b/v2/test/project-test3/project-root.jam
index c4e38e5e7..b660ceb52 100644
--- a/v2/test/project-test3/project-root.jam
+++ b/v2/test/project-test3/project-root.jam
@@ -2,10 +2,23 @@
 import gcc ;
 import property ;
 
+rule properties-as-path ( properties * )
+{
+    local r ;
+    for local p in $(properties)
+    {
+	if $(p:G) != <action>
+	{
+	    r += $(p) ;
+	}
+    }
+    return [ property.as-path
+        [ property.remove incidental : $(r) ] ] ;
+}
+
 rule yfc-compile ( target : sources * : property-set * )
 {
-    PROPERTIES on $(target) = [ 
-      property.as-path [ property.remove incidental : $(property-set) ] ] ;
+    PROPERTIES on $(target) = [ properties-as-path $(property-set) ] ;
 }
 
 actions yfc-compile
@@ -16,8 +29,7 @@ actions yfc-compile
 
 rule yfc-link ( target : sources * : property-set * )
 {
-    PROPERTIES on $(target) = [ 
-      property.as-path [ property.remove incidental : $(property-set) ] ] ;      
+    PROPERTIES on $(target) = [ properties-as-path $(property-set) ] ;
 }
 
 actions yfc-link