From 3a7b742ea78c9344f96be53cf50f86b3d0077656 Mon Sep 17 00:00:00 2001
From: David Brown <dave.github@brownsmeet.com>
Date: Wed, 24 Aug 2016 16:26:43 +0100
Subject: [PATCH] Update binary test process.

---
 src/test/confidence/testresult.sh | 2 +-
 src/tools/make/buildall.pl        | 4 ++--
 src/tools/make/postpush.pl        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/test/confidence/testresult.sh b/src/test/confidence/testresult.sh
index eb7e485b..b4c7bd19 100755
--- a/src/test/confidence/testresult.sh
+++ b/src/test/confidence/testresult.sh
@@ -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 ---"
diff --git a/src/tools/make/buildall.pl b/src/tools/make/buildall.pl
index 3363bbc4..01f262c2 100755
--- a/src/tools/make/buildall.pl
+++ b/src/tools/make/buildall.pl
@@ -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);
 }
 
diff --git a/src/tools/make/postpush.pl b/src/tools/make/postpush.pl
index a65fbb86..fe9e62ad 100755
--- a/src/tools/make/postpush.pl
+++ b/src/tools/make/postpush.pl
@@ -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;
   }