diff options
| author | Frank Ch. Eigler <fche@redhat.com> | 1998-05-04 22:18:20 +0000 |
|---|---|---|
| committer | Frank Ch. Eigler <fche@redhat.com> | 1998-05-04 22:18:20 +0000 |
| commit | 5678ce88c4f8a3cadeba754052090dbe7191fe5e (patch) | |
| tree | 4208e97b63f5630cc9d54c2119bed07456f2bedb | |
| parent | c8f28d295d5fba8ad4ca710a8e591ac890a4c2bd (diff) | |
| download | gdb-5678ce88c4f8a3cadeba754052090dbe7191fe5e.zip gdb-5678ce88c4f8a3cadeba754052090dbe7191fe5e.tar.gz gdb-5678ce88c4f8a3cadeba754052090dbe7191fe5e.tar.bz2 | |
* 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.
| -rw-r--r-- | sim/testsuite/config/default.exp | 49 | ||||
| -rw-r--r-- | sim/testsuite/configure.in | 2 | ||||
| -rw-r--r-- | sim/testsuite/sim/.Sanitize | 7 | ||||
| -rw-r--r-- | sim/testsuite/sky/Makefile.in | 6 |
4 files changed, 60 insertions, 4 deletions
diff --git a/sim/testsuite/config/default.exp b/sim/testsuite/config/default.exp new file mode 100644 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 2324bd9..1916edd 100644 --- 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 be8acc2..14ebd63 100644 --- 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 ce60cce..088d06e 100644 --- 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 $@ $< |