From: Florian Krohm <florian@eich-krohm.de>
Date: Sun, 18 May 2014 16:16:13 +0000 (+0000)
Subject: Fix exp-bbv testcases such that they can be built out-of-tree.
X-Git-Tag: svn/VALGRIND_3_10_0~454
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6eb77b4746e1bb098fe23cfdb54b59b3bf24acf3;p=thirdparty%2Fvalgrind.git

Fix exp-bbv testcases such that they can be built out-of-tree.
Part of fixing #333628.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@13982
---

diff --git a/exp-bbv/tests/amd64-linux/Makefile.am b/exp-bbv/tests/amd64-linux/Makefile.am
index a7eca39cc8..c5c68a215f 100644
--- a/exp-bbv/tests/amd64-linux/Makefile.am
+++ b/exp-bbv/tests/amd64-linux/Makefile.am
@@ -23,7 +23,7 @@ EXTRA_DIST = \
 	   rep_prefix.stderr.exp \
 	   rep_prefix.vgtest 
 
-AM_CCASFLAGS += -ffreestanding
+AM_CCASFLAGS += -ffreestanding -Xassembler -I$(top_srcdir)/exp-bbv/tests
 
 LDFLAGS += -nostartfiles -nodefaultlibs
 
diff --git a/exp-bbv/tests/amd64-linux/ll.S b/exp-bbv/tests/amd64-linux/ll.S
index 3e70cbabc9..8f446063b6 100644
--- a/exp-bbv/tests/amd64-linux/ll.S
+++ b/exp-bbv/tests/amd64-linux/ll.S
@@ -9,7 +9,7 @@
 #
 
 		
-.include "../logo.include"
+.include "logo.include"
 
 # offsets into the results returned by the uname syscall
 .equ U_SYSNAME,0
@@ -563,7 +563,7 @@ two:	.ascii	"Two\0\0\0"
 three:	.ascii	"Three\0"
 four:	.ascii	"Four\0"
 
-.include	"../logo.lzss_new"
+.include	"logo.lzss_new"
 
 disk_buffer:
 .ascii "processor	: 0\n"
diff --git a/exp-bbv/tests/arm-linux/Makefile.am b/exp-bbv/tests/arm-linux/Makefile.am
index d022cf73c0..9b91b28750 100644
--- a/exp-bbv/tests/arm-linux/Makefile.am
+++ b/exp-bbv/tests/arm-linux/Makefile.am
@@ -14,7 +14,7 @@ EXTRA_DIST = \
 	   million.post.exp \
 	   million.vgtest
 
-AM_CCASFLAGS += -ffreestanding
+AM_CCASFLAGS += -ffreestanding -Xassembler -I$(top_srcdir)/exp-bbv/tests
 
 LDFLAGS += -nostartfiles -nodefaultlibs
 
diff --git a/exp-bbv/tests/arm-linux/ll.S b/exp-bbv/tests/arm-linux/ll.S
index 0fd896a16f..231cd89b54 100644
--- a/exp-bbv/tests/arm-linux/ll.S
+++ b/exp-bbv/tests/arm-linux/ll.S
@@ -7,7 +7,7 @@
 # Modified to remove non-deterministic system calls
 # And to avoid reading from /proc
 
-.include "../logo.include"
+.include "logo.include"
 
 # offsets into the results returned by the uname syscall
 .equ U_SYSNAME,0
@@ -480,7 +480,7 @@ disk_buffer:
 sysinfo_buff:
 .long 0,0,0,0,512*1024*1024,0,0,0
 
-.include	"../logo.lzss_new"
+.include	"logo.lzss_new"
 
 
 #============================================================================
diff --git a/exp-bbv/tests/ppc32-linux/Makefile.am b/exp-bbv/tests/ppc32-linux/Makefile.am
index c094959561..56646f4a1a 100644
--- a/exp-bbv/tests/ppc32-linux/Makefile.am
+++ b/exp-bbv/tests/ppc32-linux/Makefile.am
@@ -14,7 +14,7 @@ EXTRA_DIST = \
 	   million.post.exp \
 	   million.vgtest
 
-AM_CCASFLAGS += -ffreestanding -m32
+AM_CCASFLAGS += -ffreestanding -m32 -Xassembler -I$(top_srcdir)/exp-bbv/tests
 
 LDFLAGS += -nostartfiles -nodefaultlibs -m32
 
diff --git a/exp-bbv/tests/ppc32-linux/ll.S b/exp-bbv/tests/ppc32-linux/ll.S
index 7621b95a65..692bd5d5a8 100644
--- a/exp-bbv/tests/ppc32-linux/ll.S
+++ b/exp-bbv/tests/ppc32-linux/ll.S
@@ -36,7 +36,7 @@
 .equ BSS_BEGIN,25
 .equ DATA_BEGIN,26
 
-.include "../logo.include"
+.include "logo.include"
 
 	.globl _start	
 _start:	
@@ -503,7 +503,7 @@ stdout_num:
 
 data_begin:
 
-.include "../logo.lzss_new"
+.include "logo.lzss_new"
 
 ver_string:	.ascii	" Version \0"
 compiled_string:	.ascii	", Compiled \0"
diff --git a/exp-bbv/tests/x86-linux/Makefile.am b/exp-bbv/tests/x86-linux/Makefile.am
index f2971e1c95..a16061f7aa 100644
--- a/exp-bbv/tests/x86-linux/Makefile.am
+++ b/exp-bbv/tests/x86-linux/Makefile.am
@@ -14,7 +14,7 @@ EXTRA_DIST = \
 	   ll.post.exp \
 	   ll.vgtest
 
-AM_CCASFLAGS += -ffreestanding
+AM_CCASFLAGS += -ffreestanding -Xassembler -I$(top_srcdir)/exp-bbv/tests
 
 LDFLAGS += @FLAG_M32@ -static -nostartfiles -nodefaultlibs
 
diff --git a/exp-bbv/tests/x86-linux/ll.S b/exp-bbv/tests/x86-linux/ll.S
index f0c0d2d590..b9dc52f98e 100644
--- a/exp-bbv/tests/x86-linux/ll.S
+++ b/exp-bbv/tests/x86-linux/ll.S
@@ -8,7 +8,7 @@
 # And to avoid reading from /proc
 #
 
-.include "../logo.include"
+.include "logo.include"
 
 # offsets into the results returned by the uname syscall
 .equ U_SYSNAME,0
@@ -563,7 +563,7 @@ two:	.ascii	"Two\0\0\0"
 three:	.ascii	"Three\0"
 four:	.ascii	"Four\0"
 
-.include	"../logo.lzss_new"
+.include	"logo.lzss_new"
 
 disk_buffer:
 .ascii "processor	: 0\n"