Skip to content

Commit 9d19a2d

Browse files
committed
tests: enable to override sudo
Change-Id: I1c651834a0ecdaed1289f982b226b50dae47ba74 Signed-off-by: Philippe Coval <[email protected]>
1 parent c6760ca commit 9d19a2d

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

tests/Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
# full.
1717
#
1818

19+
sudo?=
20+
1921
ifeq ($(INITIAL),)
2022

2123
INITIAL := 1
@@ -24,7 +26,7 @@ HDD = $(OBJ)/hdd.img
2426

2527
export QEMU QEMU_FLAGS INITIAL HDD
2628

27-
SYSLINUX_output-str := $(shell sudo $(SRC)/build-syslinux start \
29+
SYSLINUX_output-str := $(shell ${sudo} $(SRC)/build-syslinux start \
2830
$(objdir)/bios $(HDD) test.cfg)
2931
SYSLINUX_MOUNT_DIR = $(firstword $(SYSLINUX_output-str))
3032
SYSLINUX_INSTALL_DIR = $(SYSLINUX_MOUNT_DIR)/boot/syslinux
@@ -43,7 +45,7 @@ syslinux-tests:
4345
INITIAL="$(INITIAL)" INSTALL_DIR="$(SYSLINUX_INSTALL_DIR)" \
4446
CONFIG_FILE="$(SYSLINUX_CONFIG_FILE)" \
4547
DERIVATIVE=SYSLINUX
46-
@sudo $(SRC)/build-syslinux stop $(SYSLINUX_MOUNT_DIR) \
48+
@${sudo} $(SRC)/build-syslinux stop $(SYSLINUX_MOUNT_DIR) \
4749
$(SYSLINUX_LOOPDEV) test.cfg
4850

4951
pxelinux-tests:

tests/recipes.mk

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
#
1010
# Canned recipes
1111

12+
sudo?=sudo
13+
1214
#
1315
# copy-files - copy a config to the mounted filesystem
1416
#
@@ -19,7 +21,7 @@
1921
#
2022
define copy-files =
2123
for f in $($@_files); do \
22-
sudo cp $$f $(INSTALL_DIR) ;\
24+
${sudo} cp $$f $(INSTALL_DIR) ;\
2325
done
2426
sync
2527
endef
@@ -28,7 +30,7 @@ endef
2830
# install-config
2931
#
3032
define install-config =
31-
sudo sh -c 'echo INCLUDE $($@_cfg) >> $(CONFIG_FILE)'
33+
${sudo} sh -c 'echo INCLUDE $($@_cfg) >> $(CONFIG_FILE)'
3234
sync
3335
endef
3436

@@ -39,15 +41,15 @@ endef
3941
#
4042
define remove-files =
4143
for f in $($@_files); do \
42-
sudo rm $(INSTALL_DIR)/$$f ;\
44+
${sudo} rm $(INSTALL_DIR)/$$f ;\
4345
done
4446
endef
4547

4648
#
4749
# delete-config - remove a test's config file from the master config
4850
#
4951
define delete-config =
50-
sudo sed -i -e '/INCLUDE $($@_cfg)/d' $(CONFIG_FILE)
52+
${sudo} sed -i -e '/INCLUDE $($@_cfg)/d' $(CONFIG_FILE)
5153
endef
5254

5355
#
@@ -57,12 +59,12 @@ define run-test =
5759
$(copy-files)
5860
$(install-config)
5961

60-
sudo $(QEMU) $(QEMU_FLAGS) -serial file:$@.log
62+
${sudo} $(QEMU) $(QEMU_FLAGS) -serial file:$@.log
6163

6264
$(delete-config)
6365
$(remove-files)
6466

65-
sudo sort $@.log -o $@.log
67+
${sudo} sort $@.log -o $@.log
6668
if [ `comm -1 -3 $@.log $($@_results) | wc -l` -ne 0 ]; then \
6769
printf " [!] $@ failed\n" ;\
6870
else \

0 commit comments

Comments
 (0)