diff options
Diffstat (limited to 'usr/src/test/net-tests/tests/forwarding')
| -rw-r--r-- | usr/src/test/net-tests/tests/forwarding/README | 3 | ||||
| -rw-r--r-- | usr/src/test/net-tests/tests/forwarding/ip_forwarding.ksh | 19 |
2 files changed, 14 insertions, 8 deletions
diff --git a/usr/src/test/net-tests/tests/forwarding/README b/usr/src/test/net-tests/tests/forwarding/README index b291d5d45b..dbe8774a22 100644 --- a/usr/src/test/net-tests/tests/forwarding/README +++ b/usr/src/test/net-tests/tests/forwarding/README @@ -101,9 +101,6 @@ to router via mac-loopback. Requirements ------------ -* These tests are currently SmartOS specific as they rely on simnet - extensions only found in illumos-joyent. - * The client and server zones must provide `/usr/bin/socat`. It would be nice to use netcat but our native version is missing features like connection timeout. diff --git a/usr/src/test/net-tests/tests/forwarding/ip_forwarding.ksh b/usr/src/test/net-tests/tests/forwarding/ip_forwarding.ksh index d93260f86d..bf7a2255af 100644 --- a/usr/src/test/net-tests/tests/forwarding/ip_forwarding.ksh +++ b/usr/src/test/net-tests/tests/forwarding/ip_forwarding.ksh @@ -18,7 +18,7 @@ # # ip_forwarding.ksh -bcflnpuv <client> <router> <server> # -# Where client, router, and server are the UUIDs of three native +# Where client, router, and server are the names of three native # zones. The user must create and start these zones; but other # than that there is no special configuration required for them. # @@ -113,7 +113,7 @@ nt_rx_ip_cksum=0 nt_cleanup=1 nt_cleanup_only=0 -nt_tdirprefix=/tmp/${nt_tname} +nt_tdirprefix=/var/tmp/${nt_tname} nt_tdir=${nt_tdirprefix}.$$ nt_dfile=${nt_tdir}/${nt_tname}.data nt_efile=${nt_tdir}/${nt_tname}-expected-sha1 @@ -230,9 +230,18 @@ if ((nt_cleanup_only == 1)); then exit 0 fi -mkdir $nt_tdir -zlogin $nt_client mkdir $nt_tdir -zlogin $nt_server mkdir $nt_tdir +if ! mkdir $nt_tdir; then + fail "failed to mkdir $nt_tdir in GZ" +fi +dbg "created dir $nt_tdir in GZ" +if ! zlogin $nt_client mkdir $nt_tdir; then + fail "failed to mkdir $nt_tdir in $nt_client" +fi +dbg "created dir $nt_tdir in $nt_client" +if ! zlogin $nt_server mkdir $nt_tdir; then + fail "failed to mkdir $nt_tdir in $nt_server" +fi +dbg "created dir $nt_tdir in $nt_server" trap cleanup ERR |