diff --git a/dist/pythonlibs/testrunner/spawn.py b/dist/pythonlibs/testrunner/spawn.py index c7daa6155808..8b6c05144ce0 100644 --- a/dist/pythonlibs/testrunner/spawn.py +++ b/dist/pythonlibs/testrunner/spawn.py @@ -41,13 +41,15 @@ TESTRUNNER_RESET_AFTER_TERM = int(os.environ.get('TESTRUNNER_RESET_AFTER_TERM') or '0') +MAKE = os.environ.get('MAKE', 'make') + def _reset_board(env): if MAKE_RESET_DELAY > 0: time.sleep(MAKE_RESET_DELAY) try: - subprocess.check_output(('make', 'reset'), env=env, + subprocess.check_output((MAKE, 'reset'), env=env, stderr=subprocess.PIPE) except subprocess.CalledProcessError: # make reset yields error on some boards even if successful @@ -74,7 +76,7 @@ def setup_child(timeout=10, spawnclass=pexpect.spawnu, env=None, logfile=None): # the serial terminal. This gives time for stdio to be ready. time.sleep(MAKE_TERM_CONNECT_DELAY) - child = spawnclass("make cleanterm", env=env, timeout=timeout, + child = spawnclass("{} cleanterm".format(MAKE), env=env, timeout=timeout, codec_errors='replace', echo=False) # on many platforms, the termprog needs a short while to be ready... diff --git a/dist/tools/ci/print_toolchain_versions.sh b/dist/tools/ci/print_toolchain_versions.sh index 73d253f3cc2f..18fa3f3c1055 100755 --- a/dist/tools/ci/print_toolchain_versions.sh +++ b/dist/tools/ci/print_toolchain_versions.sh @@ -1,5 +1,7 @@ #!/bin/sh +MAKE=${MAKE:-make} + get_cmd_version() { if [ -z "$1" ]; then return @@ -80,7 +82,7 @@ get_sys_shell() { } _get_make_shell() { - make -sf - 2>/dev/null </dev/null <