tests: enable to override sudo

Change-Id: I1c651834a0ecdaed1289f982b226b50dae47ba74
Signed-off-by: Philippe Coval <philippe.coval@open.eurogiciel.org>

diff --git a/tests/Makefile b/tests/Makefile
index 99b1618..b2ccff4 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -16,6 +16,8 @@
 # full.
 #
 
+sudo?=
+
 ifeq ($(INITIAL),)
 
 INITIAL := 1
@@ -24,7 +26,7 @@ HDD = $(OBJ)/hdd.img
 
 export QEMU QEMU_FLAGS INITIAL HDD
 
-SYSLINUX_output-str := $(shell sudo $(SRC)/build-syslinux start \
+SYSLINUX_output-str := $(shell ${sudo} $(SRC)/build-syslinux start \
                                $(objdir)/bios $(HDD) test.cfg)
 SYSLINUX_MOUNT_DIR = $(firstword $(SYSLINUX_output-str))
 SYSLINUX_INSTALL_DIR = $(SYSLINUX_MOUNT_DIR)/boot/syslinux
@@ -43,7 +45,7 @@ syslinux-tests:
                INITIAL="$(INITIAL)" INSTALL_DIR="$(SYSLINUX_INSTALL_DIR)" \
                CONFIG_FILE="$(SYSLINUX_CONFIG_FILE)" \
                DERIVATIVE=SYSLINUX
-       @sudo $(SRC)/build-syslinux stop $(SYSLINUX_MOUNT_DIR) \
+       @${sudo} $(SRC)/build-syslinux stop $(SYSLINUX_MOUNT_DIR) \
                $(SYSLINUX_LOOPDEV) test.cfg
 
 pxelinux-tests:

diff --git a/tests/recipes.mk b/tests/recipes.mk
index f01c1ad..bb24961 100644 (file)
--- a/tests/recipes.mk
+++ b/tests/recipes.mk
@@ -19,7 +19,7 @@
 #
 define copy-files =
     for f in $($@_files); do \
-       sudo cp $$f $(INSTALL_DIR) ;\
+       ${sudo} cp $$f $(INSTALL_DIR) ;\
     done
     sync
 endef
@@ -28,7 +28,7 @@ endef
 # install-config
 #
 define install-config =
-    sudo sh -c 'echo INCLUDE $($@_cfg) >> $(CONFIG_FILE)'
+    ${sudo} sh -c 'echo INCLUDE $($@_cfg) >> $(CONFIG_FILE)'
     sync
 endef
 
@@ -39,7 +39,7 @@ endef
 #
 define remove-files =
     for f in $($@_files); do \
-       sudo rm $(INSTALL_DIR)/$$f ;\
+       ${sudo} rm $(INSTALL_DIR)/$$f ;\
     done
 endef
 
@@ -47,7 +47,7 @@ endef
 # delete-config - remove a test's config file from the master config
 #
 define delete-config =
-    sudo sed -i -e '/INCLUDE $($@_cfg)/d' $(CONFIG_FILE)
+    ${sudo} sed -i -e '/INCLUDE $($@_cfg)/d' $(CONFIG_FILE)
 endef
 
 #
@@ -57,12 +57,12 @@ define run-test =
     $(copy-files)
     $(install-config)
 
-    sudo $(QEMU) $(QEMU_FLAGS) -serial file:$@.log
+    ${sudo} $(QEMU) $(QEMU_FLAGS) -serial file:$@.log
 
     $(delete-config)
     $(remove-files)
 
-    sudo sort $@.log -o $@.log
+    ${sudo} sort $@.log -o $@.log
     if [ `comm -1 -3 $@.log $($@_results) | wc -l` -ne 0 ]; then \
         printf "      [!] $@ failed\n" ;\
     else \