Skip to content

Commit 01db512

Browse files
committed
Use MULTICALL=y at toybox test for faster CI
1 parent 43fcff8 commit 01db512

2 files changed

Lines changed: 6 additions & 5 deletions

File tree

.github/workflows/CICD.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1037,12 +1037,13 @@ jobs:
10371037
shell: bash
10381038
run: |
10391039
sudo apt-get -y update ; sudo apt-get -y install libselinux1-dev
1040-
- name: Build coreutils as multiple binaries
1040+
- name: Build coreutils
10411041
shell: bash
10421042
run: |
1043-
## Build individual uutil binaries
10441043
set -v
1045-
make
1044+
ln -sf /bin/* -t . # Fill not coreutils
1045+
make MULTICALL=y && (cd target/debug && for binary in $(./coreutils --list);do ln -sf coreutils ${binary};done)
1046+
10461047
- name: Run toybox src
10471048
shell: bash
10481049
run: |

GNUmakefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# spell-checker:ignore (misc) testsuite runtest findstring (targets) busytest toybox distclean pkgs nextest ; (vars/env) BINDIR BUILDDIR CARGOFLAGS DESTDIR DOCSDIR INSTALLDIR INSTALLEES MULTICALL DATAROOTDIR TESTDIR manpages
1+
# spell-checker:ignore (misc) testsuite runtest findstring (targets) busytest toybox distclean pkgs nextest ; (vars/env) BINDIR BUILDDIR CARGOFLAGS CFLAGS DESTDIR DOCSDIR INSTALLDIR INSTALLEES MULTICALL DATAROOTDIR TESTDIR manpages
22

33
# Config options
44
ifneq (,$(filter install, $(MAKECMDGOALS)))
@@ -342,7 +342,7 @@ nextest:
342342
${CARGO} nextest run ${CARGOFLAGS} --features "$(TESTS) $(TEST_SPEC_FEATURE)" $(PROFILE_CMD) --no-default-features $(TEST_NO_FAIL_FAST)
343343

344344
test_toybox:
345-
-(cd $(TOYBOX_SRC)/ && make tests)
345+
-(cd $(TOYBOX_SRC)/ && CFLAGS="-pipe -O0 -s" make tests)
346346

347347
toybox-src:
348348
if [ ! -e "$(TOYBOX_SRC)" ] ; then \

0 commit comments

Comments
 (0)