2001-05-14 Ben Elliston <bje@redhat.com>

	* sidcomp.cgen-cpu.arm7t/armconf.exp: Update srcdir names.
	* sidcomp.cgen-cpu.arm7t/armeit.conf: Likewise.
	* sidcomp.cgen-cpu.arm7t/armmisc.exp: Likewise.

diff --git a/sid/component/testsuite/ChangeLog b/sid/component/testsuite/ChangeLog
index d385bb9..0aa3b96 100644 (file)
--- a/sid/component/testsuite/ChangeLog
+++ b/sid/component/testsuite/ChangeLog
@@ -1,5 +1,9 @@
 2001-05-14  Ben Elliston  <bje@redhat.com>
 
+       * sidcomp.cgen-cpu.arm7t/armconf.exp: Update srcdir names.
+       * sidcomp.cgen-cpu.arm7t/armeit.conf: Likewise.
+       * sidcomp.cgen-cpu.arm7t/armmisc.exp: Likewise.
+
        * sidcomp.cgen-cpu/armconf.exp: Move to sidcomp.cgen-cpu.arm7t.
        * sidcomp.cgen-cpu/armeit.conf: Ditto.
        * sidcomp.cgen-cpu/armeit.tcl: Ditto.

diff --git a/sid/component/testsuite/sidcomp.cgen-cpu.arm7t/armconf.exp b/sid/component/testsuite/sidcomp.cgen-cpu.arm7t/armconf.exp
index 7995746..63b3256 100644 (file)
--- a/sid/component/testsuite/sidcomp.cgen-cpu.arm7t/armconf.exp
+++ b/sid/component/testsuite/sidcomp.cgen-cpu.arm7t/armconf.exp
@@ -7,8 +7,8 @@ if {! $sidtarget(arm)} then { untested "hw-cpu-arm7t not available"; return }
 # The .cs suffix is for ".conf'd .s".
 load_lib "cpudefs.exp"
 
-run-sid-tests arm-elf arm7tdmi $srcdir/sidcomp.cgen-cpu "arm*.cs" -EL -EL "" xl
-run-sid-tests arm-elf arm7tdmi $srcdir/sidcomp.cgen-cpu "arm*.cs" -EB -EB "" xb
+run-sid-tests arm-elf arm7tdmi $srcdir/sidcomp.cgen-cpu.arm7t "arm*.cs" -EL -EL "" xl
+run-sid-tests arm-elf arm7tdmi $srcdir/sidcomp.cgen-cpu.arm7t "arm*.cs" -EB -EB "" xb
 
-#run-sid-tests arm-elf arm7tdmi $srcdir/sidcomp.cgen-cpu "arm*.cs" -EL -EL "" pbb xl
-#run-sid-tests arm-elf arm7tdmi $srcdir/sidcomp.cgen-cpu "arm*.cs" -EB -EB "" pbb xb
+#run-sid-tests arm-elf arm7tdmi $srcdir/sidcomp.cgen-cpu.arm7t "arm*.cs" -EL -EL "" pbb xl
+#run-sid-tests arm-elf arm7tdmi $srcdir/sidcomp.cgen-cpu.arm7t "arm*.cs" -EB -EB "" pbb xb

diff --git a/sid/component/testsuite/sidcomp.cgen-cpu.arm7t/armeit.conf b/sid/component/testsuite/sidcomp.cgen-cpu.arm7t/armeit.conf
index b0e690c..8f1820c 100644 (file)
--- a/sid/component/testsuite/sidcomp.cgen-cpu.arm7t/armeit.conf
+++ b/sid/component/testsuite/sidcomp.cgen-cpu.arm7t/armeit.conf
@@ -51,7 +51,7 @@ connect-pin angel debug-rx <- stdio stdin
 connect-pin sched 0-event -> stdio poll
 
 # Load the tcl code.
-set tcl load! @-srcdir-@/sidcomp.cgen-cpu/armeit.tcl
+set tcl load! @-srcdir-@/sidcomp.cgen-cpu.arm7t/armeit.tcl
 
 # Can't connect these pins until armeit.tcl is loaded.
 connect-pin tcl nfiq! -> cpu nfiq

diff --git a/sid/component/testsuite/sidcomp.cgen-cpu.arm7t/armmisc.exp b/sid/component/testsuite/sidcomp.cgen-cpu.arm7t/armmisc.exp
index 64e822f..426fc43 100644 (file)
--- a/sid/component/testsuite/sidcomp.cgen-cpu.arm7t/armmisc.exp
+++ b/sid/component/testsuite/sidcomp.cgen-cpu.arm7t/armmisc.exp
@@ -5,8 +5,8 @@ if {! $sidtarget(arm)} then { untested "hw-cpu-arm7t not available"; return }
 # The .ms suffix is for "misc .s".
 load_lib "cpudefs.exp"
 
-run-sid-bsp-tests arm-elf arm7tdmi $srcdir/sidcomp.cgen-cpu "arm*.ms" -EL -EL "--cpu=arm --engine=scache" xl
-run-sid-bsp-tests arm-elf arm7tdmi $srcdir/sidcomp.cgen-cpu "arm*.ms" -EB -EB "--cpu=arm --engine=scache" xb
+run-sid-bsp-tests arm-elf arm7tdmi $srcdir/sidcomp.cgen-cpu.arm7t "arm*.ms" -EL -EL "--cpu=arm --engine=scache" xl
+run-sid-bsp-tests arm-elf arm7tdmi $srcdir/sidcomp.cgen-cpu.arm7t "arm*.ms" -EB -EB "--cpu=arm --engine=scache" xb
 
-#run-sid-bsp-tests arm-elf arm7tdmi $srcdir/sidcomp.cgen-cpu "arm*.ms" -EL -EL "--engine=pbb" xl
-#run-sid-bsp-tests arm-elf arm7tdmi $srcdir/sidcomp.cgen-cpu "arm*.ms" -EB -EB "--engine=pbb" xb
+#run-sid-bsp-tests arm-elf arm7tdmi $srcdir/sidcomp.cgen-cpu.arm7t "arm*.ms" -EL -EL "--engine=pbb" xl
+#run-sid-bsp-tests arm-elf arm7tdmi $srcdir/sidcomp.cgen-cpu.arm7t "arm*.ms" -EB -EB "--engine=pbb" xb