diff options
| -rw-r--r-- | .azure-pipelines.yml | 11 | ||||
| -rw-r--r-- | .gitlab-ci.yml | 13 | ||||
| -rw-r--r-- | cmd/Kconfig | 2 |
3 files changed, 24 insertions, 2 deletions
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 15520c4dafd..b3fd4ceef13 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -316,9 +316,20 @@ stages: fi export PATH=/opt/qemu/bin:/tmp/uboot-test-hooks/bin:\${PATH} export PYTHONPATH=/tmp/uboot-test-hooks/py/travis-ci + python3 -m http.server 80 --directory "\${UBOOT_TRAVIS_BUILD_DIR}" > /dev/null 2>&1 & + HTTP_PID=\$! + sleep 1 # Give the server a moment to start + if ps -p \${HTTP_PID} > /dev/null; then + export HTTP_PID + else + unset HTTP_PID + fi # "\${var:+"-k \$var"}" expands to "" if \$var is empty, "-k \$var" if not ./test/py/test.py -ra -o cache_dir="\$UBOOT_TRAVIS_BUILD_DIR"/.pytest_cache --bd \${TEST_PY_BD} \${TEST_PY_ID} \${TEST_PY_EXTRA} \${TEST_PY_TEST_SPEC:+"-k \${TEST_PY_TEST_SPEC}"} --build-dir "\$UBOOT_TRAVIS_BUILD_DIR" --report-dir "\$UBOOT_TRAVIS_BUILD_DIR" --junitxml=\$(System.DefaultWorkingDirectory)/results.xml # the below corresponds to .gitlab-ci.yml "after_script" + if [[ -n "\${HTTP_PID}" ]]; then + kill \${HTTP_PID}; + fi rm -rf /tmp/uboot-test-hooks /tmp/venv EOF - task: CopyFiles@2 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d2faa107443..18afc03b460 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -106,10 +106,21 @@ stages: # "${var:+"-k $var"}" expands to "" if $var is empty, "-k $var" if not - export PATH=/opt/qemu/bin:/tmp/uboot-test-hooks/bin:${PATH}; export PYTHONPATH=/tmp/uboot-test-hooks/py/travis-ci; + python3 -m http.server 80 --directory "${UBOOT_TRAVIS_BUILD_DIR}" > /dev/null 2>&1 & + HTTP_PID=$!; + sleep 1; + if ps -p ${HTTP_PID} > /dev/null; then + export HTTP_PID; + else + unset HTTP_PID; + fi; ./test/py/test.py -ra --bd ${TEST_PY_BD} ${TEST_PY_ID} ${TEST_PY_EXTRA} ${TEST_PY_TEST_SPEC:+"-k ${TEST_PY_TEST_SPEC}"} --build-dir "$UBOOT_TRAVIS_BUILD_DIR" - --junitxml=/tmp/${TEST_PY_BD}/results.xml + --junitxml=/tmp/${TEST_PY_BD}/results.xml; + if [[ -n "${HTTP_PID}" ]]; then + kill ${HTTP_PID}; + fi artifacts: when: always paths: diff --git a/cmd/Kconfig b/cmd/Kconfig index 9a70c7a0b83..ed741d43cea 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -2178,7 +2178,7 @@ config CMD_TFTPBOOT config CMD_WGET bool "wget" - default y if SANDBOX + default y if SANDBOX || ARCH_QEMU select WGET help wget is a simple command to download kernel, or other files, |