Merge pull request #813 from fenner/rx-truncated

Don't use nd_ipv4 for non-packet data

diff --git a/tests/TESTonce b/tests/TESTonce
index 693905768916782b30ec1d2c491372f0c25d46f5..cccc67c664e937bed1f7f14d9e7ced0747dcf683 100755 (executable)
--- a/tests/TESTonce
+++ b/tests/TESTonce
@@ -103,16 +103,16 @@ else {
 
 if($r == 0) {
     if($linecount == 0) {
-        printf "    %-35s: passed\n", $name;
+        printf "    %-40s: passed\n", $name;
     } else {
-        printf "    %-35s: passed with error messages:\n", $name;
+        printf "    %-40s: passed with error messages:\n", $name;
         system "cat $stderrlog";
     }
     unlink "DIFF/$outputbase.diff";
     exit 0;
 }
 # must have failed!
-printf "    %-35s: TEST FAILED(exit core=%d/diffstat=%d,%d/r=%d)", $name, $coredump, $diffstat, $errdiffstat, $r;
+printf "    %-40s: TEST FAILED(exit core=%d/diffstat=%d,%d/r=%d)", $name, $coredump, $diffstat, $errdiffstat, $r;
 open FOUT, '>>failure-outputs.txt';
 printf FOUT "\nFailed test: $name\n\n";
 close FOUT;

diff --git a/tests/crypto.sh b/tests/crypto.sh
index 00b60ef368b3b0e2a2e8afdb4d3c3c5fc0bfb569..d6bcfc7787e4549b87f202fa03655ba579943a73 100755 (executable)
--- a/tests/crypto.sh
+++ b/tests/crypto.sh
@@ -43,7 +43,7 @@ then
        # Reading the secret(s) from a file does not work with Capsicum.
        if grep '^#define HAVE_CAPSICUM 1$' ../config.h >/dev/null
        then
-               FORMAT='    %-35s: TEST SKIPPED (compiled w/Capsicum)\n'
+               FORMAT='    %-40s: TEST SKIPPED (compiled w/Capsicum)\n'
                printf "$FORMAT" esp4
                printf "$FORMAT" esp5
                printf "$FORMAT" espudp1
@@ -114,11 +114,11 @@ then
                echo $failed >.failed
                exitcode=1
        fi
-       FORMAT='    %-35s: TEST SKIPPED (compiled w/OpenSSL)\n'
+       FORMAT='    %-40s: TEST SKIPPED (compiled w/OpenSSL)\n'
        printf "$FORMAT" bgp-as-path-oobr-nossl
        printf "$FORMAT" bgp-aigp-oobr-nossl
 else
-       FORMAT='    %-35s: TEST SKIPPED (compiled w/o OpenSSL)\n'
+       FORMAT='    %-40s: TEST SKIPPED (compiled w/o OpenSSL)\n'
        printf "$FORMAT" esp1
        printf "$FORMAT" esp2
        printf "$FORMAT" esp3

diff --git a/tests/isis-seg-fault-1-v.sh b/tests/isis-seg-fault-1-v.sh
index da5440649b53df1e014b5a657b2f257faf30345f..970afad9297c6461ec1529e61b83184fdc897a47 100755 (executable)
--- a/tests/isis-seg-fault-1-v.sh
+++ b/tests/isis-seg-fault-1-v.sh
@@ -14,7 +14,7 @@ test_name=isis-seg-fault-1-v
 
 if [ ! -f ../Makefile ]
 then
-       printf '    %-35s: TEST SKIPPED (no Makefile)\n' $test_name
+       printf '    %-40s: TEST SKIPPED (no Makefile)\n' $test_name
 elif grep '^CC = .*gcc' ../Makefile >/dev/null
 then
        passed=`cat .passed`
@@ -29,7 +29,7 @@ then
                exitcode=1
        fi
 else
-       printf '    %-35s: TEST SKIPPED (compiler is not GCC)\n' $test_name
+       printf '    %-40s: TEST SKIPPED (compiler is not GCC)\n' $test_name
 fi
 
 exit $exitcode

diff --git a/tests/lmp-v.sh b/tests/lmp-v.sh
index 1fc1f05c4dddb9a9fa35252e7224e8859db71c93..cdcea20e5b9e4f49f2e9d959645a43cba63c6b67 100755 (executable)
--- a/tests/lmp-v.sh
+++ b/tests/lmp-v.sh
@@ -17,7 +17,7 @@ exitcode=0
 # that won't return an error when the file does not exist. Work around.
 if [ ! -f ../Makefile ]
 then
-       printf '    %-35s: TEST SKIPPED (no Makefile)\n' 'lmp-v'
+       printf '    %-40s: TEST SKIPPED (no Makefile)\n' 'lmp-v'
 elif grep '^CC = .*gcc' ../Makefile >/dev/null
 then
        passed=`cat .passed`
@@ -32,7 +32,7 @@ then
                exitcode=1
        fi
 else
-       printf '    %-35s: TEST SKIPPED (compiler is not GCC)\n' 'lmp-v'
+       printf '    %-40s: TEST SKIPPED (compiler is not GCC)\n' 'lmp-v'
 fi
 
 exit $exitcode