Browse Source

tests: fix build & disable testcommands

The perils of having tests, the test wasn't tested thoroughly enough...
Fixup various automake problems, and then disable it since it depends on
configure parameters in its current version.

For 0.99.24 we can ship a static copy of vtysh_cmd.c and have it
reenabled.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
David Lamparter 8 years ago
parent
commit
e712d0e366
3 changed files with 11 additions and 2 deletions
  1. 2 1
      tests/Makefile.am
  2. 9 1
      tests/libzebra.tests/testcommands.exp
  3. 0 0
      tests/testcommands.refout

+ 2 - 1
tests/Makefile.am

@@ -11,7 +11,7 @@ EXTRA_DIST = \
 	lib/libzebra.exp \
 	global-conf.exp \
 	testcommands.in \
-	testcommands.out
+	testcommands.refout
 
 INCLUDES = @INCLUDES@ -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib
 DEFS = @DEFS@ $(LOCAL_OPTS) -DSYSCONFDIR=\"$(sysconfdir)/\"
@@ -42,6 +42,7 @@ test-commands-defun.c: ../vtysh/vtysh_cmd.c
 		< ../vtysh/vtysh_cmd.c \
 		> test-commands-defun.c
 
+BUILT_SOURCES = test-commands-defun.c
 noinst_HEADERS = prng.h
 
 testsig_SOURCES = test-sig.c

+ 9 - 1
tests/libzebra.tests/testcommands.exp

@@ -1,7 +1,15 @@
 set timeout 30
 set test_name "testcommands"
 
-spawn sh -c "./testcommands -e 0 < testcommands.in | diff -au - testcommands.out"
+if {![info exists env(QUAGGA_TEST_COMMANDS)]} {
+	# sadly, the test randomly fails when configure parameters differ from
+	# what was used to create testcommands.refout.  this can be fixed by
+	# shipping a matching vtysh_cmd.c, which we'll add after 0.99.23
+	unresolved "$test_name"
+	exit 0
+}
+
+spawn sh -c "./testcommands -e 0 < $env(srcdir)/testcommands.in | diff -au - $env(srcdir)/testcommands.refout"
 
 expect {
 	eof {

+ 0 - 0
tests/testcommands.out → tests/testcommands.refout