* Updated build to allow srcdir != objdir. Tests still do not use dejagnu.

diff --git a/sim/testsuite/sky/ChangeLog b/sim/testsuite/sky/ChangeLog
index d2de9e047cbd6b03daee6bffb658b0e097e4c987..d22bffda24c07a401eb646500f90d46dd4bfa6c5 100644 (file)
--- a/sim/testsuite/sky/ChangeLog
+++ b/sim/testsuite/sky/ChangeLog
@@ -1,3 +1,8 @@
+Fri Feb 27 16:53:29 1998  Frank Ch. Eigler  <fche@cygnus.com>
+
+       * Makefile.in (*): Changes now allow test case srcdir != objdir.
+       Switched to "r5900.ld" linker script.
+
 Wed Feb 25 14:24:04 1998  Frank Ch. Eigler  <fche@cygnus.com>
 
        * t-pke3.trc: Added tests for PKEcode[i] stalling and masking,

diff --git a/sim/testsuite/sky/Makefile.in b/sim/testsuite/sky/Makefile.in
index 57f90d485dfc77b574ae770f0a08403b621b2b25..2076bc8b72757d4bcd465e6be7c5746f3927f188 100644 (file)
--- a/sim/testsuite/sky/Makefile.in
+++ b/sim/testsuite/sky/Makefile.in
@@ -73,7 +73,7 @@ GCC_FOR_TARGET = `\
 
 C_GEN = /build/sky-tools/c_gen.pl
 
-.SUFFIXES: .trc .c .run .ok .vif0out .vif0ok .vif0expect .vif1out .vif1ok .vif1expect
+.SUFFIXES: .trc .c .run .ok .vif0out .vif0ok .vif0expect .vif1out .vif1ok .vif1expect .uu
 
 TESTS = \
        t-pke1.c \
@@ -99,12 +99,12 @@ sanity:
 
 .run.ok:
        rm -f tmp-$* $*.hi
-       ulimit -t 5 ; $(RUN_FOR_TARGET) $*.run > tmp-$*
+       ulimit -t 5 ; $(RUN_FOR_TARGET) $< > tmp-$*
        mv tmp-$* $*.ok
 .run.ko:
        rm -f tmp-$* $*.ko
        set +e ; \
-       ulimit -t 5 ; $(RUN_FOR_TARGET) $*.run > tmp-$* ; \
+       ulimit -t 5 ; $(RUN_FOR_TARGET) $< > tmp-$* ; \
        if [ $$? -ne 0 ] ; then \
          exit 0 ; \
        else \
@@ -112,10 +112,10 @@ sanity:
        fi
        mv tmp-$* $*.ko
 .vif0out.vif0ok:
-       diff $*.vif0expect $<
+       diff $(srcdir)/$*.vif0expect $<
        touch $@
 .vif1out.vif1ok:
-       diff $*.vif1expect $<
+       diff $(srcdir)/$*.vif1expect $<
        touch $@
 
 # Rules for building all the tests
@@ -123,13 +123,15 @@ sanity:
 .trc.c:
        $(C_GEN) $< $@
 .c.run:
-       $(GCC_FOR_TARGET) -Tr5900idt.ld -o $@ $<
+       $(GCC_FOR_TARGET) -Tr5900.ld -o $@ $<
+.uu.run:
+       uudecode $< > $@
 .run.vif0out:
        rm -f $@
-       -env VIF0_TRACE_FILE=$@ $(RUN_FOR_TARGET) $*.run
+       -env VIF0_TRACE_FILE=$@ $(RUN_FOR_TARGET) $<
 .run.vif1out:
        rm -f $@
-       -env VIF1_TRACE_FILE=$@ $(RUN_FOR_TARGET) $*.run
+       -env VIF1_TRACE_FILE=$@ $(RUN_FOR_TARGET) $<