r5978 - in trunk/eda/fped: . test
werner at docs.openmoko.org
werner at docs.openmoko.org
Tue Oct 12 17:32:16 CEST 2010
Author: werner
Date: 2010-10-12 17:32:15 +0200 (Tue, 12 Oct 2010)
New Revision: 5978
Modified:
trunk/eda/fped/Makefile
trunk/eda/fped/test/Common
trunk/eda/fped/test/del_frame
trunk/eda/fped/test/del_vec
trunk/eda/fped/test/frame_ref
trunk/eda/fped/test/meas_qual
trunk/eda/fped/test/structure
trunk/eda/fped/test/tsort
Log:
Updated regression tests for output change in r5974 and improved handling of
cores.
- test/structure, test/del_vec, test/frame_ref, test/meas_qual, test/del_frame:
added newline after "unit" directive (reported by Xiangfu Liu)
- test/Common: new function expect_sed for post-processing of test output
- test/tsort: use expect_sed to ignore "(core dumped") after "Aborted"
- test/Common: if there is a file called "core", don't run it
- Makefile (clean): remove test/core
Modified: trunk/eda/fped/Makefile
===================================================================
--- trunk/eda/fped/Makefile 2010-09-12 19:41:14 UTC (rev 5977)
+++ trunk/eda/fped/Makefile 2010-10-12 15:32:15 UTC (rev 5978)
@@ -162,7 +162,7 @@
LANG= sh -c \
'passed=0 && cd test && \
for n in [a-z]*; do \
- SCRIPT=$$n CWD_PREFIX=.. . ./$$n; done; \
+ [ $$n != core ] && SCRIPT=$$n CWD_PREFIX=.. . ./$$n; done; \
echo "Passed all $$passed tests"'
valgrind:
@@ -173,7 +173,7 @@
clean:
rm -f $(OBJS) $(XPMS:%=icons/%) $(XPMS:%.xpm=icons/%.ppm)
rm -f lex.yy.c y.tab.c y.tab.h y.output .depend $(OBJS:.o=.d)
- rm -f __dbg????.png _tmp*
+ rm -f __dbg????.png _tmp* test/core
# ----- Install / uninstall ---------------------------------------------------
Modified: trunk/eda/fped/test/Common
===================================================================
--- trunk/eda/fped/test/Common 2010-09-12 19:41:14 UTC (rev 5977)
+++ trunk/eda/fped/test/Common 2010-10-12 15:32:15 UTC (rev 5978)
@@ -71,6 +71,15 @@
}
+expect_sed()
+{
+ sed "$1" <_out >_tmp || exit 1
+ mv _tmp _out
+ shift
+ expect "$@"
+}
+
+
if [ ! -z "$CWD_PREFIX" -a ! -z "$FPED" -a "$FPED" = "${FPED#/}" ]; then
FPED="$CWD_PREFIX/$FPED"
fi
Modified: trunk/eda/fped/test/del_frame
===================================================================
--- trunk/eda/fped/test/del_frame 2010-09-12 19:41:14 UTC (rev 5977)
+++ trunk/eda/fped/test/del_frame 2010-10-12 15:32:15 UTC (rev 5978)
@@ -26,6 +26,7 @@
package "_"
unit mm
+
EOF
#------------------------------------------------------------------------------
@@ -44,6 +45,7 @@
package "_"
unit mm
+
EOF
#------------------------------------------------------------------------------
@@ -63,6 +65,7 @@
package "_"
unit mm
+
EOF
#------------------------------------------------------------------------------
@@ -88,6 +91,7 @@
package "_"
unit mm
+
EOF
###############################################################################
Modified: trunk/eda/fped/test/del_vec
===================================================================
--- trunk/eda/fped/test/del_vec 2010-09-12 19:41:14 UTC (rev 5977)
+++ trunk/eda/fped/test/del_vec 2010-10-12 15:32:15 UTC (rev 5978)
@@ -12,6 +12,7 @@
package "_"
unit mm
+
EOF
#------------------------------------------------------------------------------
@@ -26,6 +27,7 @@
package "_"
unit mm
+
EOF
#------------------------------------------------------------------------------
@@ -40,6 +42,7 @@
package "_"
unit mm
+
EOF
#------------------------------------------------------------------------------
@@ -60,6 +63,7 @@
package "_"
unit mm
+
frame f @
EOF
Modified: trunk/eda/fped/test/frame_ref
===================================================================
--- trunk/eda/fped/test/frame_ref 2010-09-12 19:41:14 UTC (rev 5977)
+++ trunk/eda/fped/test/frame_ref 2010-10-12 15:32:15 UTC (rev 5978)
@@ -15,6 +15,7 @@
package "_"
unit mm
+
frame f @
EOF
@@ -32,6 +33,7 @@
package "_"
unit mm
+
frame f @
EOF
@@ -50,6 +52,7 @@
package "_"
unit mm
+
v: vec @(0mm, 0mm)
frame f .
EOF
@@ -73,6 +76,7 @@
package "_"
unit mm
+
EOF
#------------------------------------------------------------------------------
@@ -97,6 +101,7 @@
package "_"
unit mm
+
EOF
#------------------------------------------------------------------------------
@@ -138,6 +143,7 @@
package "_"
unit mm
+
EOF
###############################################################################
Modified: trunk/eda/fped/test/meas_qual
===================================================================
--- trunk/eda/fped/test/meas_qual 2010-09-12 19:41:14 UTC (rev 5977)
+++ trunk/eda/fped/test/meas_qual 2010-10-12 15:32:15 UTC (rev 5978)
@@ -27,6 +27,7 @@
package "_"
unit mm
+
frame a @
meas c.v >> c.v
EOF
Modified: trunk/eda/fped/test/structure
===================================================================
--- trunk/eda/fped/test/structure 2010-09-12 19:41:14 UTC (rev 5977)
+++ trunk/eda/fped/test/structure 2010-10-12 15:32:15 UTC (rev 5978)
@@ -10,6 +10,7 @@
package "_"
unit mm
+
EOF
#------------------------------------------------------------------------------
@@ -26,6 +27,7 @@
package "_"
unit mm
+
EOF
#------------------------------------------------------------------------------
@@ -38,6 +40,7 @@
package "hello"
unit mm
+
EOF
#------------------------------------------------------------------------------
@@ -50,6 +53,7 @@
package "_"
unit mil
+
EOF
#------------------------------------------------------------------------------
@@ -62,6 +66,7 @@
package "_"
unit mm
+
__0: vec @(1mm, 1mm)
EOF
@@ -85,6 +90,7 @@
package "_"
unit mm
+
frame f @
meas f.a -> f.b
EOF
Modified: trunk/eda/fped/test/tsort
===================================================================
--- trunk/eda/fped/test/tsort 2010-09-12 19:41:14 UTC (rev 5977)
+++ trunk/eda/fped/test/tsort 2010-10-12 15:32:15 UTC (rev 5978)
@@ -126,9 +126,9 @@
b a
}
EOF
-expect <<EOF
+expect_sed 's/Aborted.*/Aborted/' <<EOF
cycle detected in partial order
-Aborted (core dumped)
+Aborted
EOF
# not entirely comfortable about the "Aborted (core dumped)". It's a system
More information about the commitlog
mailing list