Fix make busytest

The binary was rename from uutils to coreutils in that commit
52ae491fcd
but the makefile to run the busybox test wasn't updated

This commit update the makefile to use the correct binary name.
It also update the busybox to the 1.32.1 version and fix the makefile
to run all the busybox tests instead of stopping after the failed exe
This commit is contained in:
Theophile Trunck 2021-03-10 23:13:57 +01:00
parent 734ef0a8a1
commit 9ab8bb5db5

View file

@ -41,7 +41,7 @@ PKG_BUILDDIR := $(BUILDDIR)/deps
DOCSDIR := $(BASEDIR)/docs
BUSYBOX_ROOT := $(BASEDIR)/tmp
BUSYBOX_VER := 1.24.1
BUSYBOX_VER := 1.32.1
BUSYBOX_SRC := $(BUSYBOX_ROOT)/busybox-$(BUSYBOX_VER)
# Possible programs
@ -228,7 +228,7 @@ endif
define TEST_BUSYBOX
test_busybox_$(1):
(cd $(BUSYBOX_SRC)/testsuite && bindir=$(BUILDDIR) ./runtest $(RUNTEST_ARGS) $(1) )
-(cd $(BUSYBOX_SRC)/testsuite && bindir=$(BUILDDIR) ./runtest $(RUNTEST_ARGS) $(1))
endef
# Output names
@ -276,7 +276,7 @@ $(BUILDDIR)/.config: $(BASEDIR)/.busybox-config
# Test under the busybox testsuite
$(BUILDDIR)/busybox: busybox-src build-uutils $(BUILDDIR)/.config
cp $(BUILDDIR)/uutils $(BUILDDIR)/busybox; \
cp $(BUILDDIR)/coreutils $(BUILDDIR)/busybox; \
chmod +x $@;
ifeq ($(EXES),)