File tree Expand file tree Collapse file tree 2 files changed +12
-8
lines changed Expand file tree Collapse file tree 2 files changed +12
-8
lines changed Original file line number Diff line number Diff line change 1616# full.
1717#
1818
19+ sudo? =
20+
1921ifeq ($(INITIAL ) ,)
2022
2123INITIAL := 1
@@ -24,7 +26,7 @@ HDD = $(OBJ)/hdd.img
2426
2527export 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)
2931SYSLINUX_MOUNT_DIR = $(firstword $(SYSLINUX_output-str ) )
3032SYSLINUX_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
4951pxelinux-tests :
Original file line number Diff line number Diff line change 99#
1010# Canned recipes
1111
12+ sudo? =sudo
13+
1214#
1315# copy-files - copy a config to the mounted filesystem
1416#
1921#
2022define copy-files =
2123 for f in $($@ _files) ; do \
22- sudo cp $$f $(INSTALL_DIR ) ;\
24+ ${ sudo} cp $$f $(INSTALL_DIR ) ;\
2325 done
2426 sync
2527endef
2830# install-config
2931#
3032define install-config =
31- sudo sh -c 'echo INCLUDE $($@ _cfg) >> $(CONFIG_FILE ) '
33+ ${ sudo} sh -c 'echo INCLUDE $($@ _cfg) >> $(CONFIG_FILE ) '
3234 sync
3335endef
3436
@@ -39,15 +41,15 @@ endef
3941#
4042define remove-files =
4143 for f in $($@ _files) ; do \
42- sudo rm $(INSTALL_DIR ) /$$f ;\
44+ ${ sudo} rm $(INSTALL_DIR ) /$$f ;\
4345 done
4446endef
4547
4648#
4749# delete-config - remove a test's config file from the master config
4850#
4951define delete-config =
50- sudo sed -i -e '/INCLUDE $($@ _cfg) /d' $(CONFIG_FILE )
52+ ${ sudo} sed -i -e '/INCLUDE $($@ _cfg) /d' $(CONFIG_FILE )
5153endef
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 \
You can’t perform that action at this time.
0 commit comments