Removes rsync from the makeref (redo); adds BROWSER_MANIFEST file check

Makefile

@@ -48,13 +48,16 @@ test:
 
 BROWSER_MANIFEST ?= resources/browser_manifests/browser_manifest.json
 
-reftest:
+check-browser-manifest:
+	@ls test/$(BROWSER_MANIFEST) || { echo "ERROR: Browser manifest file is not found at test/$(BROWSER_MANIFEST). Create one using the examples at test/resources/browser_manifests/."; exit 1; }
+
+reftest: check-browser-manifest
 	cd test; python test.py --reftest --browserManifestFile=$(BROWSER_MANIFEST)
 
-makeref:
-	cd test; python test.py -m --browserManifestFile=$(BROWSER_MANIFEST)
+makeref: check-browser-manifest
+	cd test; python test.py --masterMode --browserManifestFile=$(BROWSER_MANIFEST)
 
-reftest-swfdec:
+reftest-swfdec: check-browser-manifest
 	cd test; python test.py --reftest --browserManifestFile=$(BROWSER_MANIFEST) --manifestFile=swfdec_test_manifest.json
 
 hello-world:
@@ -109,5 +112,5 @@ start-build-bot:
 
 .PHONY: check-system install-libs install-utils build-tamarin-tests \
         build-playerglobal build-extension build-web test default \
-        reftest reftest-swfdec
+        reftest reftest-swfdec makeref check-browser-manifest
 

test/test.py

@@ -519,10 +519,9 @@ def maybeUpdateRefImages(options, browser):
             if options.noPrompts or prompt('Would you like to update the master copy in ref/?'):
                 sys.stdout.write('  Updating ref/ ... ')
 
-                # XXX unclear what to do on errors here ...
-                # NB: do *NOT* pass --delete to rsync.  That breaks this
-                # entire scheme.
-                subprocess.check_call(( 'rsync', '-arvq', 'tmp/', 'ref/' ))
+                subprocess.check_call('mkdir -p ref', shell = True)
+                subprocess.check_call('cp -Rf tmp/* ref/', shell = True)
+                subprocess.check_call('rm -rf tmp', shell = True)
 
                 print 'done'
             else: