diff options
| -rwxr-xr-x | MakeRelease.job | 2 | ||||
| -rwxr-xr-x | TestRelease.job | 2 | ||||
| -rwxr-xr-x | docker-run.sh | 2 | ||||
| -rw-r--r-- | jenkins-helpers.sh | 2 | ||||
| -rwxr-xr-x | tcwg-benchmark.sh | 4 | ||||
| -rwxr-xr-x | tcwg-buildfarm.sh | 48 | ||||
| -rwxr-xr-x | tcwg-dev-build.sh | 12 | ||||
| -rwxr-xr-x | tcwg-update-host-containers.sh | 8 | ||||
| -rwxr-xr-x | tcwg-update-snapshots_ref.sh | 16 | ||||
| -rwxr-xr-x | tcwg-update-tested.sh | 8 | ||||
| -rwxr-xr-x | tcwg-upstream2gerrit.sh | 12 | ||||
| -rwxr-xr-x | tcwg_kernel-build.sh | 26 |
12 files changed, 71 insertions, 71 deletions
diff --git a/MakeRelease.job b/MakeRelease.job index 88f5d65f..83d80f20 100755 --- a/MakeRelease.job +++ b/MakeRelease.job @@ -49,7 +49,7 @@ target="" fileserver="" extra= toolchain_config="" -user_workspace="${WORKSPACE:-/home/${USER:-buildslave}/workspace}" +user_workspace="${WORKSPACE-/home/${USER-buildslave}/workspace}" abe_dir= binariesdir= logsdir= diff --git a/TestRelease.job b/TestRelease.job index e7db8878..afc004ae 100755 --- a/TestRelease.job +++ b/TestRelease.job @@ -92,7 +92,7 @@ fi # Compile the test case rm -f ${testdir}/hi -params="-o ${testdir}/hi ${testdir}/hello.cpp ${specs:-} -static" +params="-o ${testdir}/hi ${testdir}/hello.cpp ${specs-} -static" if test ${win32} -eq 0; then ${testdir}/${dir}/bin/${target}-c++ ${params} else diff --git a/docker-run.sh b/docker-run.sh index 4f281caf..b1914333 100755 --- a/docker-run.sh +++ b/docker-run.sh @@ -2,7 +2,7 @@ set -ef -o pipefail -qemu="${qemu:-}" +qemu="${qemu-}" set -u . $(dirname $0)/jenkins-helpers.sh diff --git a/jenkins-helpers.sh b/jenkins-helpers.sh index b0146866..3af858de 100644 --- a/jenkins-helpers.sh +++ b/jenkins-helpers.sh @@ -409,7 +409,7 @@ wait_for_ssh_server () set -euf -o pipefail local session_host="$1" local session_port="$2" - local count="${3:-20}" + local count="${3-20}" while [ $count -gt 0 ] do diff --git a/tcwg-benchmark.sh b/tcwg-benchmark.sh index 15e133f2..6128b125 100755 --- a/tcwg-benchmark.sh +++ b/tcwg-benchmark.sh @@ -6,9 +6,9 @@ set -ex # Make shellcheck happy and workaround Jenkins not defining variables # for empty arguments. -build_container_tag="${build_container_tag:-xenial-tcwg-tested}" +build_container_tag="${build_container_tag-xenial-tcwg-tested}" toolchain_url="$toolchain_url" -toolchain_type="${toolchain_type:-auto}" +toolchain_type="${toolchain_type-auto}" bench_list="$bench_list" cflags="$cflags" extension="$extension" diff --git a/tcwg-buildfarm.sh b/tcwg-buildfarm.sh index c5709d6f..7fa08486 100755 --- a/tcwg-buildfarm.sh +++ b/tcwg-buildfarm.sh @@ -9,30 +9,30 @@ convert_args_to_variables "$@" # Make shellcheck happy and workaround Jenkins not defining variables # for empty arguments. -label="${label:-tcwg-x86_64-build}" -target="${target:-aarch64-linux-gnu}" -NODE_NAME="${NODE_NAME:-$(hostname)}" -TCWG_SES_USER="${TCWG_SES_USER:-}" -TCWG_SES_PASSWORD="${TCWG_SES_PASSWORD:-}" -WORKSPACE="${WORKSPACE:-$(pwd)}" -override="${override:-}" -host_x86_64_languages="${host_x86_64_languages:-default}" -host_aarchXX_languages="${host_aarchXX_languages:-c,c++}" -runtests="${runtests:-aarch64-linux-gnu}" -send_results_to="${send_results_to:-}" -try_bootstrap="${try_bootstrap:-true}" -host_x86_64_excludecheck="${host_x86_64_excludecheck:-gdb}" -host_aarchXX_excludecheck="${host_aarchXX_excludecheck:-gcc}" -extraconfig="${extraconfig:-}" -rebuild="${rebuild:-true}" -log_name="${log_name:-$target}" -dont_fail="${dont_fail:-false}" -log_server="${log_server:-dev-01.tcwglab:$HOME/logs}" -abe_branch="${abe_branch:-refs/heads/tested}" -build_container_tag="${build_container_tag:-xenial-tcwg-tested}" -test_container_tag="${test_container_tag:-xenial-tcwg-tested}" -binaries="${binaries:-false}" -dryrun="${dryrun:-false}" +label="${label-tcwg-x86_64-build}" +target="${target-aarch64-linux-gnu}" +NODE_NAME="${NODE_NAME-$(hostname)}" +TCWG_SES_USER="${TCWG_SES_USER-}" +TCWG_SES_PASSWORD="${TCWG_SES_PASSWORD-}" +WORKSPACE="${WORKSPACE-$(pwd)}" +override="${override-}" +host_x86_64_languages="${host_x86_64_languages-default}" +host_aarchXX_languages="${host_aarchXX_languages-c,c++}" +runtests="${runtests-aarch64-linux-gnu}" +send_results_to="${send_results_to-}" +try_bootstrap="${try_bootstrap-true}" +host_x86_64_excludecheck="${host_x86_64_excludecheck-gdb}" +host_aarchXX_excludecheck="${host_aarchXX_excludecheck-gcc}" +extraconfig="${extraconfig-}" +rebuild="${rebuild-true}" +log_name="${log_name-$target}" +dont_fail="${dont_fail-false}" +log_server="${log_server-dev-01.tcwglab:$HOME/logs}" +abe_branch="${abe_branch-refs/heads/tested}" +build_container_tag="${build_container_tag-xenial-tcwg-tested}" +test_container_tag="${test_container_tag-xenial-tcwg-tested}" +binaries="${binaries-false}" +dryrun="${dryrun-false}" # Jenkins doesn't define variables when parameter value is empty, # so enable "set -u" only after above binding of variables. diff --git a/tcwg-dev-build.sh b/tcwg-dev-build.sh index 8c911c23..cf24ab60 100755 --- a/tcwg-dev-build.sh +++ b/tcwg-dev-build.sh @@ -6,12 +6,12 @@ scripts=$(dirname $0) . $scripts/jenkins-helpers.sh convert_args_to_variables "$@" -abe_branch="${abe_branch:-tested}" -dry_run="${dry_run:-false}" -release_name="${release_name:-default}" -target="${target:-aarch64-linux-gnu}" -version="${version:-default}" -verbose="${verbose:-true}" +abe_branch="${abe_branch-tested}" +dry_run="${dry_run-false}" +release_name="${release_name-default}" +target="${target-aarch64-linux-gnu}" +version="${version-default}" +verbose="${verbose-true}" set -u diff --git a/tcwg-update-host-containers.sh b/tcwg-update-host-containers.sh index cb121249..33351ed0 100755 --- a/tcwg-update-host-containers.sh +++ b/tcwg-update-host-containers.sh @@ -5,10 +5,10 @@ set -ef -o pipefail . $(dirname $0)/jenkins-helpers.sh convert_args_to_variables "$@" -container="${container:-jenkins}" -distro="${distro:-xenial}" -group="${group:-default}" -verbose="${verbose:-true}" +container="${container-jenkins}" +distro="${distro-xenial}" +group="${group-default}" +verbose="${verbose-true}" set -u diff --git a/tcwg-update-snapshots_ref.sh b/tcwg-update-snapshots_ref.sh index 56cce69a..55252760 100755 --- a/tcwg-update-snapshots_ref.sh +++ b/tcwg-update-snapshots_ref.sh @@ -7,14 +7,14 @@ convert_args_to_variables "$@" # Make shellcheck happy and workaround Jenkins not defining variables # for empty arguments. -label="${label:-tcwg-x86_64-dev-01}" -generate_abe="${generate_abe:-true}" -generate_llvm="${generate_llvm:-true}" -generate_misc="${generate_misc:-true}" -update_abe_git="${update_abe_git:-true}" -update_llvm_git="${update_llvm_git:-true}" -verbose="${verbose:-true}" -abe_branch="${abe_branch:-tested}" +label="${label-tcwg-x86_64-dev-01}" +generate_abe="${generate_abe-true}" +generate_llvm="${generate_llvm-true}" +generate_misc="${generate_misc-true}" +update_abe_git="${update_abe_git-true}" +update_llvm_git="${update_llvm_git-true}" +verbose="${verbose-true}" +abe_branch="${abe_branch-tested}" # Jenkins doesn't define variables when parameter value is empty, # so enable "set -u" only after above binding of variables. diff --git a/tcwg-update-tested.sh b/tcwg-update-tested.sh index a3111f5e..a68cabc8 100755 --- a/tcwg-update-tested.sh +++ b/tcwg-update-tested.sh @@ -7,10 +7,10 @@ convert_args_to_variables "$@" # Make shellcheck happy and workaround Jenkins not defining variables # for empty arguments. -GIT_COMMIT="${GIT_COMMIT:-HEAD}" -GIT_COMMIT_1="${GIT_COMMIT_1:-HEAD}" -GIT_COMMIT_2="${GIT_COMMIT_2:-HEAD}" -verbose="${verbose:-true}" +GIT_COMMIT="${GIT_COMMIT-HEAD}" +GIT_COMMIT_1="${GIT_COMMIT_1-HEAD}" +GIT_COMMIT_2="${GIT_COMMIT_2-HEAD}" +verbose="${verbose-true}" # Jenkins doesn't define variables when parameter value is empty, # so enable "set -u" only after above binding of variables. diff --git a/tcwg-upstream2gerrit.sh b/tcwg-upstream2gerrit.sh index eba5aab5..f1fc3fb9 100755 --- a/tcwg-upstream2gerrit.sh +++ b/tcwg-upstream2gerrit.sh @@ -7,12 +7,12 @@ convert_args_to_variables "$@" # Make shellcheck happy and workaround Jenkins not defining variables # for empty arguments. -branch="${branch:-master}" -patches="${patches:-last}" -project="${project:-gcc}" -squash="${squash:-false}" -filter="${filter:-false}" -verbose="${verbose:-true}" +branch="${branch-master}" +patches="${patches-last}" +project="${project-gcc}" +squash="${squash-false}" +filter="${filter-false}" +verbose="${verbose-true}" # Jenkins doesn't define variables when parameter value is empty, # so enable "set -u" only after above binding of variables. diff --git a/tcwg_kernel-build.sh b/tcwg_kernel-build.sh index f9ba98b0..c67b7ca4 100755 --- a/tcwg_kernel-build.sh +++ b/tcwg_kernel-build.sh @@ -12,7 +12,7 @@ declare -A git_branch convert_args_to_variables "@@gnu-default" "@@llvm-default" "@@linux-default" "$@" # Execution mode: baseline, jenkins-full, bisect. -mode="${mode:-baseline}" +mode="${mode-baseline}" # Toolchain to use: gnu or llvm obligatory_variables toolchain @@ -25,18 +25,18 @@ esac # Set custom revision for one of the projects, and use baseline revisions # for all other projects. -current_project="${current_project:-none}" -current_rev="${current_rev:-default}" - -linux_config="${linux_config:-defconfig}" -reset_baseline="${reset_baseline:-false}" -start_at="${start_at:-default}" -finish_at="${finish_at:-default}" -target="${target:-native}" -tidy="${tidy:-true}" -top_artifacts="${top_artifacts:-$(pwd)/artifacts}" -verbose="${verbose:-true}" -verbose2="${verbose2:-false}" +current_project="${current_project-none}" +current_rev="${current_rev-default}" + +linux_config="${linux_config-defconfig}" +reset_baseline="${reset_baseline-false}" +start_at="${start_at-default}" +finish_at="${finish_at-default}" +target="${target-native}" +tidy="${tidy-true}" +top_artifacts="${top_artifacts-$(pwd)/artifacts}" +verbose="${verbose-true}" +verbose2="${verbose2-false}" set -u |