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 a7eca39cc80280e6f69c41ffc94f56b7f9dfdd5c..c5c68a215fb9623c5b47cb928c73937598c18bf9 100644 (file)
--- 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 3e70cbabc991a7b0cf581e11093a985a64a4ea23..8f446063b6b3458fceb3a61bd131273e76bf3572 100644 (file)
--- 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 d022cf73c0dce91005015abdf2447cb929b653c7..9b91b287506be44fb178b2e725a80cd225f929bf 100644 (file)
--- 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 0fd896a16f27114bccf38031dcea38f02542f901..231cd89b54fce71b0cfc09202db7a70ca758dfaf 100644 (file)
--- 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 c09495956150ddef56f1ad43836f5ebb576746cc..56646f4a1a6fe8b528a4ca57425cd23f37c3396c 100644 (file)
--- 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 7621b95a655783bf7624d53194c2cf97ff3c504b..692bd5d5a834686348f28ede477ded082dfa22a9 100644 (file)
--- 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 f2971e1c95bdbd985027d7ae472008b21432343d..a16061f7aa68ffcef5cafade086b53e5d492a537 100644 (file)
--- 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 f0c0d2d5909d0a13ae6c0860680b9d20dec544e7..b9dc52f98ef301377b1af9d19c6abe6b69753ef5 100644 (file)
--- 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"