* Added hooks to new dejagnu sky tests, removed old test from run.

Mon May  4 17:59:11 1998  Frank Ch. Eigler  <fche@cygnus.com>

start-sanitize-sky
	* configure.in (testdir): Don't use old sky test directory.
	* configure: Regenerated
	* sky/Makefile.in: swallow stderr on buggy tests
end-sanitize-sky
	* config/default.exp: Added C compiler settings.

diff --git a/sim/testsuite/config/default.exp b/sim/testsuite/config/default.exp
new file mode 100644 (file)
index 0000000..43c0381
--- /dev/null
+++ b/sim/testsuite/config/default.exp
@@ -0,0 +1,49 @@
+# Simulator default dejagnu configuration file.
+
+load_lib sim-defs.exp
+
+global AS
+if ![info exists AS] {
+    set AS [findfile $base_dir/../../gas/as-new $base_dir/../../gas/as-new \
+                    [transform as]]
+}
+
+global ASFLAGS
+if ![info exists ASFLAGS] {
+    set ASFLAGS ""
+}
+
+global CC
+if ![info exists CC] {
+    set CC [findfile $base_dir/../../gcc/xgcc $base_dir/../../gcc/xgcc \
+                    [transform gcc]]
+}
+
+global CFLAGS
+if ![info exists CFLAGS] {
+    set CFLAGS ""
+}
+
+global LD
+if ![info exists LD] {
+    set LD [findfile $base_dir/../../ld/ld-new $base_dir/../../ld/ld-new \
+                    [transform ld]]
+}
+
+global LDFLAGS
+if ![info exists LDFLAGS] {
+    set LDFLAGS ""
+}
+
+global SIM
+if ![info exists SIM] {
+    set SIM [findfile $base_dir/../$arch/run $base_dir/../$arch/run \
+                     [transform run]]
+}
+
+global SIMFLAGS
+if ![info exists SIMFLAGS] {
+    set SIMFLAGS ""
+}
+
+sim_init

diff --git a/sim/testsuite/configure.in b/sim/testsuite/configure.in
index 2324bd93e463fc924ddcfa9a4b38e2a5814354d4..1916edd4e1447acdc39580444b93200bba92be5f 100644 (file)
--- a/sim/testsuite/configure.in
+++ b/sim/testsuite/configure.in
@@ -24,7 +24,7 @@ fi
 # add any extra subdirectories
 case $target in
   # start-sanitize-sky
-  mips64r5900-sky-elf) configdirs="${configdirs} sky" ;;
+  mips64r5900-sky-elf) configdirs="${configdirs}" ;;
   # end-sanitize-sky
   *) ;;
 esac

diff --git a/sim/testsuite/sim/.Sanitize b/sim/testsuite/sim/.Sanitize
index be8acc29b3081eead6933c49d83009d8086def00..14ebd632ddb72e7e960736a53aeadfc31e916569 100644 (file)
--- a/sim/testsuite/sim/.Sanitize
+++ b/sim/testsuite/sim/.Sanitize
@@ -21,6 +21,13 @@ Do-first:
 # called.  Directories not listed will be removed in their entirety
 # with rm -rf.
 
+sky_files="sky"
+if ( echo $* | grep keep\-sky > /dev/null ) ; then
+        keep_these_too="${sky_files} ${keep_these_too}"
+else
+        lose_these_too="${sky_files} ${lose_these_too}"
+fi
+
 Things-to-keep:
 
 m32r

diff --git a/sim/testsuite/sky/Makefile.in b/sim/testsuite/sky/Makefile.in
index ce60ccecda81b7eb9a3c1b6e83baca3c6b8dff71..088d06e39ede749331fbf89e9215dd43a5412f06 100644 (file)
--- a/sim/testsuite/sky/Makefile.in
+++ b/sim/testsuite/sky/Makefile.in
@@ -196,12 +196,12 @@ sce%.ok: sce%.exe
 
 .run.ok:
        rm -f tmp-$* $*.hi
-       ulimit -t $(ULIMIT) ; $(RUN_FOR_TARGET) $< > tmp-$*
+       ulimit -t $(ULIMIT) ; $(RUN_FOR_TARGET) $< > tmp-$* 2>/dev/null
        mv tmp-$* $*.ok
 .run.ko:
        rm -f tmp-$* $*.ko
        set +e ; \
-       ulimit -t $(ULIMIT) ; $(RUN_FOR_TARGET) $< > tmp-$* ; \
+       ulimit -t $(ULIMIT) ; $(RUN_FOR_TARGET) $< > tmp-$* 2>/dev/null ; \
        if [ $$? -ne 0 ] ; then \
          exit 0 ; \
        else \
@@ -236,7 +236,7 @@ sce%.ok: sce%.exe
        -env VIF1_TRACE_FILE=$@ $(RUN_FOR_TARGET) $<
 .run.vuout:
        rm -f $@
-       -env SKY_DEBUG=inst_trace $(RUN_FOR_TARGET) $< > $@
+       -env SKY_DEBUG=inst_trace $(RUN_FOR_TARGET) $< > $@ 2>/dev/null
 .s.run:
        rm -f $@
        $(AS_FOR_TARGET) -mcpu=r5900 -o $@ $<