Fix building of BSPs in different source directories than their name.

Also fix missing include directory required by beagle for the testsuite.

6 files changed, 13 insertions, 13 deletions

diff --git a/testsuites/fstests/wscript b/testsuites/fstests/wscript
index ab8cea1932..4cc6c94060 100644
--- a/testsuites/fstests/wscript
+++ b/testsuites/fstests/wscript
@@ -13,7 +13,7 @@ def build(ctx):
 			source,
 			includes	= includes_common + includes,
 			use = use,
-			features = "src_include_rtems src_include_score src_include_bsp src_include_bsp_common"
+			features = "src_include_rtems src_include_score src_include_bsp src_include_bsp_common src_include_bsp_arch"
 		)
 
 	def objects_common(target, source):
@@ -21,7 +21,7 @@ def build(ctx):
 			source		= source,
 			name		= "fstests_%s_common" % target,
 			includes	= ["%s/testsuites/fstests/%s_support" % (srcnode, target)] + includes_common,
-			features	= "bld_include src_include src_include_rtems src_include_score src_include_bsp src_include_bsp_common"
+			features	= "bld_include src_include src_include_rtems src_include_score src_include_bsp src_include_bsp_common src_include_bsp_arch"
 		)
 
 
diff --git a/testsuites/psxtests/wscript b/testsuites/psxtests/wscript
index a186ed359b..3c56a2ad9c 100644
--- a/testsuites/psxtests/wscript
+++ b/testsuites/psxtests/wscript
@@ -14,7 +14,7 @@ def build(ctx):
 			includes	= [
 				"%s/testsuites/psxtests/include/" % srcnode,
 			] + includes_merge,
-			features	= "test_include src_include_score src_include_bsp src_include_bsp_common",
+			features	= "test_include src_include_score src_include_bsp src_include_bsp_common src_include_bsp_arch",
 			**kwarg
 		)
 
diff --git a/testsuites/psxtmtests/wscript b/testsuites/psxtmtests/wscript
index 06214e9591..3ef4831efe 100644
--- a/testsuites/psxtmtests/wscript
+++ b/testsuites/psxtmtests/wscript
@@ -14,7 +14,7 @@ def build(ctx):
 			includes	= [
 				"%s/testsuites/tmtests/include/" % srcnode,
 			] + includes_merge,
-			features	= "test_include src_include_rtems src_include_score src_include_bsp src_include_bsp_common",
+			features	= "test_include src_include_rtems src_include_score src_include_bsp src_include_bsp_common src_include_bsp_arch",
 			**kwarg
 		)
 
diff --git a/testsuites/sptests/wscript b/testsuites/sptests/wscript
index d7628bb721..5a7a808eb7 100644
--- a/testsuites/sptests/wscript
+++ b/testsuites/sptests/wscript
@@ -3,7 +3,7 @@ def build(ctx):
 		ctx.rtems_test(
 			"sptests_%s" % target,
 			source,
-			features	= "test_include src_include_rtems src_include_score src_include_bsp src_include_bsp_common",
+			features	= "test_include src_include_rtems src_include_score src_include_bsp src_include_bsp_common src_include_bsp_arch",
 			**kwarg
 		)
 
@@ -102,7 +102,7 @@ def build(ctx):
 				"%s/testsuites/support/include" % ctx.srcnode.abspath(),
 				"%s/testsuites/sptests/%s" % (ctx.srcnode.abspath(), target)
 			],
-			features	= "src_include_rtems src_include_score src_include_bsp src_include_bsp_common",
+			features	= "src_include_rtems src_include_score src_include_bsp src_include_bsp_common src_include_bsp_arch",
 			use="test_sptests_spfatal_support"
 		)
 
@@ -144,7 +144,7 @@ def build(ctx):
 			"%s/testsuites/support/include" % ctx.srcnode.abspath(),
 			"%s/testsuites/sptests/spintrcritical_support" % ctx.srcnode.abspath()
 		],
-		features    = "bld_include src_include src_include_rtems src_include_score src_include_bsp src_include_bsp_common"
+		features    = "bld_include src_include src_include_rtems src_include_score src_include_bsp src_include_bsp_common src_include_bsp_arch"
 	)
 
 	def spincritical(target, source, **kwargs):
@@ -154,7 +154,7 @@ def build(ctx):
 			includes	= [
 				"%s/testsuites/sptests/spintrcritical_support" % ctx.srcnode.abspath()
 			],
-			features	= "test_include src_include_rtems src_include_score src_include_bsp src_include_bsp_common",
+			features	= "test_include src_include_rtems src_include_score src_include_bsp src_include_bsp_common src_include_bsp_arch",
 			use="test_sptests_spintrcritical_support",
 			**kwargs
 		)
diff --git a/testsuites/tmtests/wscript b/testsuites/tmtests/wscript
index ee2e11c4ae..608810435f 100644
--- a/testsuites/tmtests/wscript
+++ b/testsuites/tmtests/wscript
@@ -8,7 +8,7 @@ def build(ctx):
 				"%s/testsuites/tmtests/include/" % ctx.srcnode.abspath(),
 				"%s/testsuites/support/include/" % ctx.srcnode.abspath(),
 			],
-			features	= "src_include src_include_rtems src_include_score src_include_bsp src_include_bsp_common"
+			features	= "src_include src_include_rtems src_include_score src_include_bsp src_include_bsp_common src_include_bsp_arch"
 		)
 
 	test("tmck", "tmck/task1.c")
diff --git a/testsuites/wscript b/testsuites/wscript
index c3ebff5f15..6bb13ca484 100644
--- a/testsuites/wscript
+++ b/testsuites/wscript
@@ -12,27 +12,27 @@ def build(ctx):
 		source		= ["support/src/spin.c"],
 		name		= "test_support_spin",
 		includes	= ["%s/testsuites/support/include/" % srcnode], #XXX: why was this added in ac165341
-		features	= "bld_include src_include src_include_rtems src_include_score"
+		features	= "bld_include src_include src_include_rtems src_include_score src_include_bsp_arch"
 	)
 
 	ctx.objects(
 		source		= ["support/src/test_support.c"],
 		name		= "test_support",
-		features	= "bld_include src_include test_include src_include_rtems src_include_score src_include_bsp src_include_bsp_common"
+		features	= "bld_include src_include test_include src_include_rtems src_include_score src_include_bsp src_include_bsp_common src_include_bsp_arch"
 	)
 
 	ctx.objects(
 		source		= ["support/src/tmtests_support.c"],
 		name		= "test_support_tmtests",
 		includes	= ["%s/testsuites/tmtests/include/" % srcnode],
-		features	= "bld_include src_include test_include src_include_rtems src_include_score src_include_bsp src_include_bsp_common"
+		features	= "bld_include src_include test_include src_include_rtems src_include_score src_include_bsp src_include_bsp_common src_include_bsp_arch"
 	)
 
 	if ctx.env.ENABLE_SMP and ctx.env.BSP[0] in ["sparc/leon3", "i386/pc386"]:
 		ctx.objects(
 			source		= ["support/src/locked_print.c"],
 			name		= "test_support_locked_print",
-			features	= "bld_include src_include test_include src_include_rtems src_include_score src_include_bsp src_include_bsp_common"
+			features	= "bld_include src_include test_include src_include_rtems src_include_score src_include_bsp src_include_bsp_common src_include_bsp_arch"
 		)
 
 	ctx.recurse("fstests")