Remove vestigial support for auto-running unit tests.

These hadn't worked for a long time.

diff --git a/datapath/linux-2.4/Makefile.in b/datapath/linux-2.4/Makefile.in
index 36ff04781f606c534ee262503508f86a518b2c2d..1a68376c8263213724b479ee5c7d3cb82d3d4cc2 100644 (file)
--- a/datapath/linux-2.4/Makefile.in
+++ b/datapath/linux-2.4/Makefile.in
@@ -2,7 +2,6 @@ builddir = @abs_builddir@
 srcdir = @abs_srcdir@
 top_srcdir = @abs_top_srcdir@
 KSRC = @KSRC24@
-VMDIR = @VMDIR@
 VERSION = @VERSION@
 
 # The names vpath and VPATH are very special for GNU Make and Automake.

diff --git a/datapath/linux-2.6/Makefile.main.in b/datapath/linux-2.6/Makefile.main.in
index d6768a7f34967c9d14b32f6c6e1e6a3b20834517..10ea36e1638bb28777ab18a234e97279ac57f087 100644 (file)
--- a/datapath/linux-2.6/Makefile.main.in
+++ b/datapath/linux-2.6/Makefile.main.in
@@ -3,7 +3,6 @@ export builddir = @abs_builddir@
 export srcdir = @abs_srcdir@
 export top_srcdir = @abs_top_srcdir@
 export KSRC = @KSRC26@
-export VMDIR = @VMDIR@
 export VERSION = @VERSION@
 
 include $(srcdir)/../Modules.mk

diff --git a/datapath/run-unit-tests b/datapath/run-unit-tests
deleted file mode 100755 (executable)
index 85257fc..0000000
--- a/datapath/run-unit-tests
+++ /dev/null
@@ -1,64 +0,0 @@
-#! /bin/sh -ex
-
-fail () {
-    echo "$@"
-    exit 1
-}
-
-test -n "$VMDIR" || fail "must pass --with-vm to configure to run unit tests"
-
-rm -rf tmp
-mkdir tmp
-cd tmp
-
-ln -s $KSRC/arch/i386/boot/bzImage kernel.bin
-ln -s $VMDIR/hda.dsk hda.dsk
-
-cat > unit.conf <<EOF
-MEM=128         # Avoids kmalloc failures that clutter output.
-SWITCHES=
-VMS="unit"
-unit_NETS=""
-EOF
-
-unit_tests="table_t crc_t forward_t"
-unit_tests_comma=`echo $unit_tests | sed 's/ /,/g'`
-if test "$KVERSION" = 2.6; then
-    prereq_modules="openflow_mod.ko"
-    unit_mod="unit_mod.ko"
-elif test "$KVERSION" = 2.4; then
-    prereq_modules="compat24_mod.o openflow_mod.o"
-    unit_mod="unit_mod.o"
-else
-    fail "\$KVERSION not set"
-fi
-
-load_prereqs=
-for d in $prereq_modules; do
-    load_prereqs="$load_prereqs
-insmod $d"
-done
-
-mkdir unit.cd
-ln -s $KSRC/System.map $KSRC/vmlinux unit.cd
-for d in $prereq_modules $unit_mod; do
-    ln -s $builddir/$d unit.cd
-done
-cat > unit.cd/runme <<EOF
-#! /bin/sh -x
-$load_prereqs
-insmod $unit_mod 'run="$unit_tests_comma"' || true
-poweroff
-EOF
-chmod a+x unit.cd/runme
-
-$top_srcdir/switch/utilities/start-test-vm -f unit unit.conf
-
-grep -3 FAIL unit.log && fail "Unit test failed (see tmp/unit.log)"
-for d in $unit_tests; do
-    grep -F -q "$d: PASS" unit.log || fail "$d didn't pass (see tmp/unit.log)"
-done
-
-rm -rf tmp
-
-echo "Unit tests passed"