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

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

diff --git a/src/test/confidence/testresult.sh b/src/test/confidence/testresult.sh
index a827345f..b4c7bd19 100755
--- a/src/test/confidence/testresult.sh
+++ b/src/test/confidence/testresult.sh
@@ -7,16 +7,16 @@ fi
 
 # Compare generated code
 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.s
+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.s -a old.$FLAVOUR -nt ../../../../bootstrap/unix-44/Configuration.c ]
+  if [ -f old.$FLAVOUR.$BRANCH.s -a old.$FLAVOUR.$BRANCH.s -nt ../planned-binary-change ]
   then
-    if diff -b old.$FLAVOUR.s new.$FLAVOUR.s
+    if diff -b old.$FLAVOUR.$BRANCH.s new.$FLAVOUR.$BRANCH.s
     then echo "--- Generated code unchanged ---"
     else echo "--- Generated code changed ---"
     fi
   else
-    cp new.$FLAVOUR.s old.$FLAVOUR.s
+    cp new.$FLAVOUR.$BRANCH.s old.$FLAVOUR.$BRANCH.s
     echo "--- Generated code snapped ---"
   fi
 
diff --git a/src/tools/make/buildall.pl b/src/tools/make/buildall.pl
index 42397639..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"],
diff --git a/src/tools/make/vishap.make b/src/tools/make/vishap.make
index 69ec4464..17bb1b95 100644
--- a/src/tools/make/vishap.make
+++ b/src/tools/make/vishap.make
@@ -378,7 +378,7 @@ sourcechanges:
 
 
 
-RUNTEST = COMPILER=$(COMPILER) OBECOMP=$(VISHAP) FLAVOUR=$(FLAVOUR) sh ./test.sh "$(INSTALLDIR)"
+RUNTEST = COMPILER=$(COMPILER) OBECOMP=$(VISHAP) FLAVOUR=$(FLAVOUR) BRANCH=$(BRANCH) sh ./test.sh "$(INSTALLDIR)"
 
 confidence:
 	@printf "\n\n--- Confidence tests ---\n\n"