aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2017-04-29 15:14:01 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2017-04-29 15:14:01 +0200
commitdb938098044fc5fb76fcdfbec2a28d232028aa51 (patch)
treee6f979825aa8821e3862ba4c1078c6652c988067
parent8da6f37f76606a811357b138b4e1533404b4bb11 (diff)
Update to standard versioning scheme
-rw-r--r--tests/agent/testscript2
-rw-r--r--tests/machine/testscript4
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/agent/testscript b/tests/agent/testscript
index c5396b4..529e0db 100644
--- a/tests/agent/testscript
+++ b/tests/agent/testscript
@@ -101,7 +101,7 @@ rm = $src_base/btrfs-rmdir /build/machines
trace: enumerate_machines: bootstrapped linux-gcc
EOE
- sed -i -e 's/^(bbot-version):.*/\1: 99999900/' $m/linux-gcc-default/manifest
+ sed -i -e 's/^(bbot-version):.*/\1: 9999999990000/' $m/linux-gcc-default/manifest
: re-bootstrap-bbot-newer
:
diff --git a/tests/machine/testscript b/tests/machine/testscript
index dfd1312..91313d3 100644
--- a/tests/machine/testscript
+++ b/tests/machine/testscript
@@ -29,7 +29,7 @@ rfp = FF:DF:7D:38:67:4E:C3:82:65:7E:EE:1F:D4:80:EC:56:C4:33:5B:65:3F:9B:29:9A:30
+curl -s -S -f -L $toolchain_url/toolchain.sha256 >=toolchain.sha256
+sed -n -e 's%^[0-9a-f]+ \*(.+)$%\1%p' toolchain.sha256 | set -e archives
-+sed -n -e 's%^(.+/)?build2-toolchain-(.+)\.tar.*%\2%p' <"$archives" | set version
++sed -n -e 's%^(.+/)?build2-toolchain-([^.]+\.[^.]+\.[^-]+(-[ab]\.[^.+]+)?).*\.tar.*%\2%p' <"$archives" | set version
+sha256sum -b toolchain.sha256 | sed -n -e 's%^([0-9a-f]+) .*$%\1%p' | set checksum
+/bin/bash -c "while read i && test -n \"\$i\"; do \
@@ -37,7 +37,7 @@ b=`basename \$i` ; \
f=$tftp/toolchains/default/\$b; \
echo \$b: 1>&2; \
curl -# -f -L -z \$f -o \$f $toolchain_url/\$i; \
-ln -sf \$b `sed -n -re 's/^\(.+\)-$version\(.+\)/\\1\\2/p' <<<\$f`; \
+ln -sf \$b `sed -n -re 's/^\(.+\)-$version\(\\..+\)?\(\\.zip|\\.tar\\..+\|-.+)/\\1\\3/p' <<<\$f`; \
done" <"$archives" 2>|
+echo "$version" >=$tftp/toolchains/default/version