Update binary test process.

This commit is contained in:
David Brown 2016-08-24 16:26:43 +01:00
parent ca2cc52a44
commit 3a7b742ea7
3 changed files with 4 additions and 4 deletions

View file

@ -9,7 +9,7 @@ fi
if [ -f new.asm ]
then egrep '^[0-9 ]{4} ([0-9a-f]{4}| ) [0-9A-F]{2}[0-9A-F ]{6}' new.asm|cut -c 11- >new.$FLAVOUR.$BRANCH.s
if [ -f old.$FLAVOUR.$BRANCH.s -a old.$FLAVOUR.$BRANCH -nt ../planned-binary-change ]
if [ -f old.$FLAVOUR.$BRANCH.s -a old.$FLAVOUR.$BRANCH.s -nt ../planned-binary-change ]
then
if diff -b old.$FLAVOUR.$BRANCH.s new.$FLAVOUR.$BRANCH.s
then echo "--- Generated code unchanged ---"

View file

@ -14,7 +14,7 @@ my %machines = (
"wind" => ['-p5932 dave@wax', "", "vishaps/voc", "export CC=gcc && make full;"
. "export CC=i686-w64-mingw32-gcc && make full;"
. "cd ~;"
. "sh start64.sh \\\"cd vishaps/voc && git checkout $branch && git pull;"
. "sh start64.sh \\\"cd vishaps/voc && git pull && git checkout $branch && git pull;"
. "export CC=gcc && make full;"
. "export CC=x86_64-w64-mingw32-gcc && make full\\\""],
"android" => ['-p8022 root@and', "", "vishap/voc", "export CC=gcc && make full"],
@ -55,7 +55,7 @@ unlink glob "log/*";
for my $machine (sort keys %machines) {
my ($login, $sudo, $dir, $mkcmd) = @{$machines{$machine}};
my $cmd = "ssh $login \"cd $dir && $sudo git checkout $branch && $sudo git pull && $sudo $mkcmd\" ";
my $cmd = "ssh $login \"cd $dir && $sudo git pull && $sudo git checkout -f $branch && $sudo git pull && $sudo $mkcmd\" ";
logged($cmd, $machine);
}

View file

@ -43,7 +43,7 @@ if ($buildneeded) {
} else {
close(STDIN); close(STDOUT); close(STDERR); # child process
system 'echo Syncing voc>postpush.log';
system '(cd voc; git pull; git checkout ' . $branch . ') >>postpush.log';
system '(cd voc; git pull; git checkout -f ' . $branch . '; git pull; git checkout -f) >>postpush.log';
exec 'perl voc/src/tools/make/buildall.pl ' . $branch . ' >/tmp/buildall.log';
exit;
}