RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 03:27:44 +00:00
Code Issues Activity

Merge pull request #807 from uutils/revert-805-master

Browse source 
Revert "Allow selection of tests to not pass to BusyBox"
This commit is contained in:
Michael Gehring 2016-01-12 20:14:33 +01:00
commit 8aead4f36e
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Makefile
View file

@ -241,13 +241,13 @@ $(foreach util,$(EXES),$(eval $(call BUILD_EXE,$(util))))
build-pkgs: $(addprefix build_exe_,$(EXES)) build-pkgs: $(addprefix build_exe_,$(EXES))
build-uutils: build-uutils:
${CARGO} build ${CARGOFLAGS} --features "${EXES}" ${PROFILE_CMD} --no-default-features ${CARGO} build ${CARGOFLAGS} --features "${EXES}" ${PROFILE_CMD} --no-default-features
build: build-uutils build-pkgs build: build-uutils build-pkgs
$(foreach test,$(TESTS),$(eval $(call TEST_INTEGRATION,$(test)))) $(foreach test,$(TESTS),$(eval $(call TEST_INTEGRATION,$(test))))
$(foreach test,$(filter-out $(DONT_TEST),$(PROGS)),$(eval $(call TEST_BUSYBOX,$(test)))) $(foreach test,$(PROGS),$(eval $(call TEST_BUSYBOX,$(test))))
test: $(addprefix test_integration_,$(TESTS)) test: $(addprefix test_integration_,$(TESTS))
@ -259,18 +259,18 @@ busybox-src:
fi; \ fi; \
# This is a busybox-specific config file their test suite wants to parse. # This is a busybox-specific config file their test suite wants to parse.
$(BUILDDIR)/.config: $(BASEDIR)/.busybox-config $(BUILDDIR)/.config: $(BASEDIR)/.busybox-config
cp $< $@ cp $< $@
# Test under the busybox testsuite # Test under the busybox testsuite
$(BUILDDIR)/busybox: busybox-src build-uutils $(BUILDDIR)/.config $(BUILDDIR)/busybox: busybox-src build-uutils $(BUILDDIR)/.config
cp $(BUILDDIR)/uutils $(BUILDDIR)/busybox; \ cp $(BUILDDIR)/uutils $(BUILDDIR)/busybox; \
chmod +x $@; chmod +x $@;
ifeq ($(EXES),) ifeq ($(EXES),)
busytest: busytest:
else else
busytest: $(BUILDDIR)/busybox $(addprefix test_busybox_,$(filter-out $(DONT_TEST),$(EXES))) busytest: $(BUILDDIR)/busybox $(addprefix test_busybox_,$(EXES))
endif endif
clean: clean:
@ -279,7 +279,7 @@ clean:
distclean: clean distclean: clean
$(CARGO) clean $(CARGOFLAGS) && $(CARGO) update $(CARGOFLAGS) $(CARGO) clean $(CARGOFLAGS) && $(CARGO) update $(CARGOFLAGS)
install: build install: build
mkdir -p $(INSTALLDIR_BIN) mkdir -p $(INSTALLDIR_BIN)
ifeq (${MULTICALL}, y) ifeq (${MULTICALL}, y)
install $(BUILDDIR)/uutils $(INSTALLDIR_BIN)/$(PROG_PREFIX)uutils install $(BUILDDIR)/uutils $(INSTALLDIR_BIN)/$(PROG_PREFIX)uutils