From 6abbd31061820555a28223756f80122b422ae7a0 Mon Sep 17 00:00:00 2001
From: Simon South <ssouth@simonsouth.com>
Date: Sun, 1 Nov 2015 04:26:22 -0500
Subject: [PATCH] unittests: Build copied BAppTest files

This adds to the "unittests" target a dependency on the
"AppTestRunApp3a" (etc.) files meant to be copied as part of the
BApplication test suite so they are generated when "jam unittests" is
run.

* TestsRules: Add "UnitTestDependency" rule.
* testapps/Jamfile: Make unit tests depend on copied files.

Fixes #12441.

Signed-off-by: Adrien Destugues <pulkomandy@pulkomandy.tk>
---
 build/jam/TestsRules                             | 10 ++++++++--
 src/tests/kits/app/bapplication/testapps/Jamfile |  2 ++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/build/jam/TestsRules b/build/jam/TestsRules
index 68f67eeb6be..fc1c166ccd5 100644
--- a/build/jam/TestsRules
+++ b/build/jam/TestsRules
@@ -1,6 +1,12 @@
 # unit test pseudo target
 NotFile unittests ;
 
+rule UnitTestDependency
+{
+	Depends unittests : $(1) ;
+}
+
+
 rule UnitTestLib
 {
 	# UnitTestLib <lib> : <sources> : <libraries> ;
@@ -30,7 +36,7 @@ rule UnitTestLib
 	MakeLocate $(lib) : $(TARGET_UNIT_TEST_LIB_DIR) ;
 	SharedLibrary $(lib) : $(sources) : $(libraries) libcppunit.so ;
 
-	Depends unittests : $(lib) ;
+	UnitTestDependency $(lib) ;
 }
 
 
@@ -60,7 +66,7 @@ rule UnitTest
 	SimpleTest $(target) : $(sources) : $(libraries) libcppunit.so
 		: $(resources) ;
 
-	Depends unittests : $(target) ;
+	UnitTestDependency $(target) ;
 }
 
 
diff --git a/src/tests/kits/app/bapplication/testapps/Jamfile b/src/tests/kits/app/bapplication/testapps/Jamfile
index 2f9d3f7be0d..fc90743e9ae 100644
--- a/src/tests/kits/app/bapplication/testapps/Jamfile
+++ b/src/tests/kits/app/bapplication/testapps/Jamfile
@@ -42,6 +42,8 @@ rule CopyBAppTestApp
 	File $(target) : $(source) ;
 	MODE on $(target) = $(EXEMODE) ;
 	MimeSet $(target) ;
+
+	UnitTestDependency $(target) ;
 }
 
 # BApplication::BApplication() test apps