From: Stéphane Graber <stgraber@ubuntu.com>
Date: Fri, 24 Jan 2014 17:51:01 +0000 (-0500)
Subject: tests: Fix lxc-user-nic path
X-Git-Tag: lxc-1.0.0.beta3~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8cb8e496d08bae106ef1294f5c321cc4b0a92f2a;p=thirdparty%2Flxc.git

tests: Fix lxc-user-nic path

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
---

diff --git a/configure.ac b/configure.ac
index 6bfe96bfd..8914f8176 100644
--- a/configure.ac
+++ b/configure.ac
@@ -696,6 +696,7 @@ AC_CONFIG_FILES([
 	src/lua-lxc/Makefile
 
 	src/tests/Makefile
+	src/tests/lxc-test-usernic
 ])
 AC_CONFIG_COMMANDS([default],[[]],[[]])
 AC_OUTPUT
diff --git a/src/tests/lxc-test-usernic b/src/tests/lxc-test-usernic.in
similarity index 88%
rename from src/tests/lxc-test-usernic
rename to src/tests/lxc-test-usernic.in
index d00b223b3..eb0f30e5e 100755
--- a/src/tests/lxc-test-usernic
+++ b/src/tests/lxc-test-usernic.in
@@ -22,6 +22,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 DONE=0
+LXC_USER_NIC="@LIBEXECDIR@/lxc/lxc-user-nic"
 
 cleanup() {
 	(
@@ -95,7 +96,7 @@ run_cmd "lxc-start -n b1 -d"
 p1=$(run_cmd "lxc-info -n b1 -p -H")
 
 # Assign one veth, should fail as no allowed entries yet
-if run_cmd "lxc-user-nic $p1 veth usernic-br0 xx1"; then
+if run_cmd "$LXC_USER_NIC $p1 veth usernic-br0 xx1"; then
 	echo "FAIL: able to create nic with no entries"
 	exit 1
 fi
@@ -106,24 +107,24 @@ sed -i '/^usernic-user/d' /etc/lxc/lxc-usernet
 echo "usernic-user veth usernic-br0 2" >> /etc/lxc/lxc-usernet
 
 # Assign one veth to second bridge, should fail
-if run_cmd "lxc-user-nic $p1 veth usernic-br1 xx1"; then
+if run_cmd "$LXC_USER_NIC $p1 veth usernic-br1 xx1"; then
 	echo "FAIL: able to create nic with no entries"
 	exit 1
 fi
 
 # Assign two veths, should succeed
-if ! run_cmd "lxc-user-nic $p1 veth usernic-br0 xx2"; then
+if ! run_cmd "$LXC_USER_NIC $p1 veth usernic-br0 xx2"; then
 	echo "FAIL: unable to create first nic"
 	exit 1
 fi
 
-if ! run_cmd "lxc-user-nic $p1 veth usernic-br0 xx3"; then
+if ! run_cmd "$LXC_USER_NIC $p1 veth usernic-br0 xx3"; then
 	echo "FAIL: unable to create second nic"
 	exit 1
 fi
 
 # Assign one more veth, should fail.
-if run_cmd "lxc-user-nic $p1 veth usernic-br0 xx4"; then
+if run_cmd "$LXC_USER_NIC $p1 veth usernic-br0 xx4"; then
 	echo "FAIL: able to create third nic"
 	exit 1
 fi
@@ -133,7 +134,7 @@ run_cmd "lxc-stop -n b1 -k"
 run_cmd "lxc-start -n b1 -d"
 p1=$(run_cmd "lxc-info -n b1 -p -H")
 
-if ! run_cmd "lxc-user-nic $p1 veth usernic-br0 xx5"; then
+if ! run_cmd "$LXC_USER_NIC $p1 veth usernic-br0 xx5"; then
 	echo "FAIL: unable to create nic after destroying the old"
 	cleanup 1
 fi
@@ -146,7 +147,7 @@ lxc-start -n usernic-c1 -d
 p2=$(lxc-info -n usernic-c1 -p -H)
 
 # assign veth to it - should fail
-if run_cmd "lxc-user-nic $p2 veth usernic-br0 xx6"; then
+if run_cmd "$LXC_USER_NIC $p2 veth usernic-br0 xx6"; then
 	echo "FAIL: able to attach nic to root-owned container"
 	cleanup 1
 fi