Skip to content

Commit 75b20d3

Browse files
committed
Use MULTICALL=y at toybox test for faster CI
1 parent 3016496 commit 75b20d3

2 files changed

Lines changed: 4 additions & 5 deletions

File tree

.github/workflows/CICD.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1093,12 +1093,11 @@ jobs:
10931093
shell: bash
10941094
run: |
10951095
sudo apt-get -y update ; sudo apt-get -y install libselinux1-dev
1096-
- name: Build coreutils as multiple binaries
1096+
- name: Build coreutils
10971097
shell: bash
10981098
run: |
1099-
## Build individual uutil binaries
11001099
set -v
1101-
make
1100+
make MULTICALL=y && (cd target/debug && for binary in $(./coreutils --list);do ln -sf coreutils ${binary};done)
11021101
- name: Run toybox src
11031102
shell: bash
11041103
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)))
@@ -170,7 +170,7 @@ nextest:
170170
${CARGO} nextest run ${CARGOFLAGS} --features "$(TESTS) $(TEST_SPEC_FEATURE)" $(PROFILE_CMD) --no-default-features $(TEST_NO_FAIL_FAST)
171171

172172
test_toybox:
173-
-(cd $(TOYBOX_SRC)/ && make tests)
173+
-(cd $(TOYBOX_SRC)/ && CFLAGS="-pipe -O0 -s" make tests)
174174

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

0 commit comments

Comments
 (0)