]> git.ipfire.org Git - thirdparty/unbound.git/commitdiff
Fixup testsetup for VM tests (testcode/run_vm.sh).
authorWouter Wijngaards <wouter@nlnetlabs.nl>
Tue, 24 Jun 2014 10:26:02 +0000 (10:26 +0000)
committerWouter Wijngaards <wouter@nlnetlabs.nl>
Tue, 24 Jun 2014 10:26:02 +0000 (10:26 +0000)
git-svn-id: file:///svn/unbound/trunk@3147 be551aaa-1e26-0410-a405-d3ace91eadb9

33 files changed:
doc/Changelog
testcode/run_vm.sh [new file with mode: 0644]
testdata/09-unbound-control.tpkg
testdata/ctrl_itr.tpkg
testdata/edns_lame.tpkg
testdata/fwd_bogus.tpkg
testdata/fwd_capsid.tpkg
testdata/fwd_capsid_fallback.tpkg
testdata/fwd_compress_c00c.tpkg
testdata/fwd_edns_bksec.tpkg
testdata/fwd_edns_probe.tpkg
testdata/fwd_no_edns.tpkg
testdata/fwd_oneport.tpkg
testdata/fwd_tcp.tpkg
testdata/fwd_tcp_tc.tpkg
testdata/fwd_three.tpkg
testdata/fwd_three_service.tpkg
testdata/fwd_ttlexpire.tpkg
testdata/fwd_udp.tpkg
testdata/fwd_udptmout.tpkg
testdata/fwd_waitudp.tpkg
testdata/fwd_zero.tpkg
testdata/local_nodefault.tpkg
testdata/local_norec.tpkg
testdata/local_nosnoop.tpkg
testdata/remote-threaded.tpkg
testdata/speed_cache.tpkg
testdata/speed_local.tpkg
testdata/stat_timer.tpkg
testdata/stream_ssl.tpkg
testdata/stream_tcp.tpkg
testdata/stub_udp.tpkg
testdata/tcp_sigpipe.tpkg

index 20ca8e7a0007cc5f2470d641b5020a837f17b592..b19d233b2d59f1ec19adf8c43879ae1197fac60b 100644 (file)
@@ -1,6 +1,7 @@
 24 June 2014: Wouter
        - Fix caps-for-id fallback, and added fallback attempt when servers
          drop 0x20 perturbed queries.
+       - Fixup testsetup for VM tests (testcode/run_vm.sh).
 
 17 June 2014: Wouter
        - iana portlist updated.
diff --git a/testcode/run_vm.sh b/testcode/run_vm.sh
new file mode 100644 (file)
index 0000000..78649f0
--- /dev/null
@@ -0,0 +1,78 @@
+#!/usr/local/bin/bash
+# run tpkg tests from within a VM.  Looks for loopback addr.
+# if run not from within a VM, runs the tests as usual.
+# with one argument: run that tpkg, otherwise, run all tpkgs.
+
+get_lo0_ip4() {
+        if test -x /sbin/ifconfig
+        then
+                LO0_IP4=`/sbin/ifconfig lo0 | grep '[^0-9]127\.' | sed -e 's/^[^1]*\(127\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\)[^0-9]*.*$/\1/g'`
+                if ( echo $LO0_IP4 | grep '^127\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*$' > /dev/null )
+                then
+                        return
+                fi
+        fi
+        LO0_IP4=127.0.0.1
+}
+get_lo0_ip4
+export LO0_IP4
+if test "x$LO0_IP4" = "x127.0.0.1"
+then
+        ALT_LOOPBACK=false
+else
+        ALT_LOOPBACK=true
+fi
+cd testdata
+TPKG=../testcode/mini_tpkg.sh
+#RUNLIST=`(ls -1 *.tpkg|grep -v '^0[016]')`
+RUNLIST=`(ls -1 *.tpkg)`
+if test "$#" = "1"; then RUNLIST="$1"; fi
+
+# fix up tpkg that was edited on keyboard interrupt.
+cleanup() {
+       echo cleanup
+       if test -f "$t.bak"; then mv "$t.bak" "$t"; fi
+       exit 0
+}
+trap cleanup SIGINT
+
+for t in $RUNLIST
+do
+       if ! $ALT_LOOPBACK
+       then
+               $TPKG exe $t
+               continue
+       fi
+       # We have alternative 127.0.0.1 number
+       if ( echo $t | grep '6\.tpkg$' ) # skip IPv6 tests
+       then
+               continue
+               elif test "$t" = "edns_cache.tpkg" # This one is IPv6 too!
+       then
+               continue
+       fi
+       cp -p "$t" "$t.bak"
+       tar xzf $t
+       find "${t%.tpkg}.dir" -type f \
+               -exec grep -q -e '127\.0\.0\.1' -e '@localhost' {} \; -print | {
+               while read f
+               do
+                       sed "s/127\.0\.0\.1/${LO0_IP4}/g" "$f" > "$f._"
+                       mv "$f._" "$f"
+                       sed "s/@localhost/@${LO0_IP4}/g" "$f" > "$f._"
+                       mv "$f._" "$f"
+               done
+       }
+       find "${t%.tpkg}.dir" -type d -name "127.0.0.1" -print | {
+               while read d
+               do
+                       mv -v "$d" "${d%127.0.0.1}${LO0_IP4}"
+               done
+       }
+       tar czf $t "${t%.tpkg}.dir"
+       rm -fr "${t%.tpkg}.dir"
+       $TPKG exe $t
+       mv "$t.bak" "$t"
+done
+# get out of testdata/
+cd ..
index d7a9ceb269321ca664a02f5fa1d82389af69fbdc..62b2097bde5c8471a7f2ded12a34e5d6e8e25f35 100644 (file)
Binary files a/testdata/09-unbound-control.tpkg and b/testdata/09-unbound-control.tpkg differ
index 8134b651ff40d195ae844bd0c6265f80b05ba9e7..dadf0a307c9fc5904c17a25e130b6880c3ed6e6d 100644 (file)
Binary files a/testdata/ctrl_itr.tpkg and b/testdata/ctrl_itr.tpkg differ
index a11a47508395ef69f4de5ba0ee4528be5e395a60..643fe0c6129898ce57b77482f692c0917c94ccd8 100644 (file)
Binary files a/testdata/edns_lame.tpkg and b/testdata/edns_lame.tpkg differ
index e060f5f9cebcdd355c6c3c5cb5422dc93ae25bfc..9f4d655dc2049f7aee651efb0e1246f630b717ce 100644 (file)
Binary files a/testdata/fwd_bogus.tpkg and b/testdata/fwd_bogus.tpkg differ
index c468a2edc500dfbefa297c025a8293ce1444f92e..3f50639cb21516a181ee4e003a5c076a2c665ea5 100644 (file)
Binary files a/testdata/fwd_capsid.tpkg and b/testdata/fwd_capsid.tpkg differ
index c6fd4cdf83cc0560c02bf8f95c235e59e86a2294..fed74134cfb41061c2e6ddc8db5f76610471d928 100644 (file)
Binary files a/testdata/fwd_capsid_fallback.tpkg and b/testdata/fwd_capsid_fallback.tpkg differ
index 6b06a8608db065c21ffaa99c54b92f7ae6f9c7ea..c48fbbc00457c9243c7a2b03326bba781256f75c 100644 (file)
Binary files a/testdata/fwd_compress_c00c.tpkg and b/testdata/fwd_compress_c00c.tpkg differ
index 5869ffa9ec3401ceaa6e7721f2c3e75c97dc652d..ad63224d17ccbaa3d06e6be6d85a80c93e64a194 100644 (file)
Binary files a/testdata/fwd_edns_bksec.tpkg and b/testdata/fwd_edns_bksec.tpkg differ
index 853b4ab00ee06883ffe1f4c73a14ba6c677bd97c..c92689797df85fe7b6a78de67720d25f618a7e57 100644 (file)
Binary files a/testdata/fwd_edns_probe.tpkg and b/testdata/fwd_edns_probe.tpkg differ
index 1629cba0144cb266a13e625f6792124177815135..9de545d164d08498dc922de43519f87c66d13001 100644 (file)
Binary files a/testdata/fwd_no_edns.tpkg and b/testdata/fwd_no_edns.tpkg differ
index d752f852ce76845e4d488e14ad3a65e9574bf4e6..02f5182d39bfeeec5d4f1a303e4ed44a055c61d9 100644 (file)
Binary files a/testdata/fwd_oneport.tpkg and b/testdata/fwd_oneport.tpkg differ
index f26a4e60cb76b1ab909e5f31d7ea5cd81517e3f1..e85b93b90334faccb4e751200d3619ff5ce3e584 100644 (file)
Binary files a/testdata/fwd_tcp.tpkg and b/testdata/fwd_tcp.tpkg differ
index a51258eb42023eb0efc4b0b834fc4ad48ffc4a1a..3f2c423385ca4697a6c755c2ab6c47d20f33fafb 100644 (file)
Binary files a/testdata/fwd_tcp_tc.tpkg and b/testdata/fwd_tcp_tc.tpkg differ
index afb05167f07c859aebfa80f9fa154b0470ba20fc..24771698daf19a989c0cf894f501dd72f2092a19 100644 (file)
Binary files a/testdata/fwd_three.tpkg and b/testdata/fwd_three.tpkg differ
index 8660e1de9d694346745dd2ab2cbfc168bd9469ba..949cdcefa232960131e2bbc777e685d77e003646 100644 (file)
Binary files a/testdata/fwd_three_service.tpkg and b/testdata/fwd_three_service.tpkg differ
index 5b124348e44ba3e1f47dd121a1a23adbb532d0d4..1111d8e52aee692e49d9dc9d72d8d2417b5043c7 100644 (file)
Binary files a/testdata/fwd_ttlexpire.tpkg and b/testdata/fwd_ttlexpire.tpkg differ
index b515d8317326e12b52bdb4080338491a1bf0385f..4fd67469978d75dc58e95f70f05811a9ba98e772 100644 (file)
Binary files a/testdata/fwd_udp.tpkg and b/testdata/fwd_udp.tpkg differ
index ca1527a718c499482a5cb37a62bd911c868d72e4..0c476320098ebe3e29bc8688c480b8074fff1675 100644 (file)
Binary files a/testdata/fwd_udptmout.tpkg and b/testdata/fwd_udptmout.tpkg differ
index 975da2160f0aaa625b4559085fa2edc2169e32b8..db3cd8ea67da64656e7205e1df3421475e49c186 100644 (file)
Binary files a/testdata/fwd_waitudp.tpkg and b/testdata/fwd_waitudp.tpkg differ
index adadef133c850ddf703d0804c19178e1758dbdc7..bff17baa99d3ca16d2b538fa0596288b8a534532 100644 (file)
Binary files a/testdata/fwd_zero.tpkg and b/testdata/fwd_zero.tpkg differ
index f23f50dd158935f2f617cc37008f282569b86edd..5f9dc441a338e3d520f4d9362329c1ff70fa5c84 100644 (file)
Binary files a/testdata/local_nodefault.tpkg and b/testdata/local_nodefault.tpkg differ
index c2ceb22ea24e894545dbb31343e15cb237877f6c..2258695d8c503e62c63708e6a4b4932e23e4122d 100644 (file)
Binary files a/testdata/local_norec.tpkg and b/testdata/local_norec.tpkg differ
index 3bb16c265578a7c905adec6139cb5d65378872e8..23765b29836af31b99f6800534b72c683d48f4e9 100644 (file)
Binary files a/testdata/local_nosnoop.tpkg and b/testdata/local_nosnoop.tpkg differ
index 8dfdd6b71632169efff50f835ee749bb0460e228..0e614d87a9b659b9b98fa53f43276994cf0134e2 100644 (file)
Binary files a/testdata/remote-threaded.tpkg and b/testdata/remote-threaded.tpkg differ
index cdba5e3f93ed5cd79323b15d3d10708b726c96c5..bade5288b3a43a5e5221a7fdd9b577d7f9301f63 100644 (file)
Binary files a/testdata/speed_cache.tpkg and b/testdata/speed_cache.tpkg differ
index e7d7c5d5e2dbd95c2491b5c95176a8f0bf97662f..572f60cf14ca0cf1a980d6dca66cfccdec4e894b 100644 (file)
Binary files a/testdata/speed_local.tpkg and b/testdata/speed_local.tpkg differ
index 1f11591a77f1827ba09630a1ada8d5e1eda9a9c8..982e698829ab963c541a7430f24cacd8077fbe92 100644 (file)
Binary files a/testdata/stat_timer.tpkg and b/testdata/stat_timer.tpkg differ
index 724e4af6c824c6f43f1dcf5ded0a212a2410d2a4..cf734d4d70b11e09f597a9e43ab71f9c0462ec2f 100644 (file)
Binary files a/testdata/stream_ssl.tpkg and b/testdata/stream_ssl.tpkg differ
index 37cb249b159836668754b16f19a19b0a0361213f..9cc58912e4dfe67b2749dc2fa3b4595dbbed4e7f 100644 (file)
Binary files a/testdata/stream_tcp.tpkg and b/testdata/stream_tcp.tpkg differ
index 2743a6cf1f49666088e25f2085bdf82b351cdf83..9a4757d60daa004804190d65c3c5907ea8f3dc13 100644 (file)
Binary files a/testdata/stub_udp.tpkg and b/testdata/stub_udp.tpkg differ
index 2f6e3e7a60edbf0b20296b919f76a7180571576e..4d6dee4d41b7ac8cd22046e639e9c4ac22205d0a 100644 (file)
Binary files a/testdata/tcp_sigpipe.tpkg and b/testdata/tcp_sigpipe.tpkg differ