Refactor rebaseline.py into functions ; no behavioral changes.

tools/rebaseline.py

 #!/usr/bin/python

[epoger, 2013/05/29 16:19:37]

I have confirmed that there are no behavioral changes, as follows:

# Record results before making any changes...
WORKING_DIR=/tmp/rebaseline/before
TRUNK_DIR=$PWD
rm -rf $WORKING_DIR
mkdir -p $WORKING_DIR
pushd $WORKING_DIR
svn co -r 9314 --depth immediates http://skia.googlecode.com/svn/gm-expected .
python $TRUNK_DIR/tools/rebaseline.py verttext 
svn stat | sort >svn-stat
popd
chmod a-w -R /tmp/rebaseline/before

# After making changes to rebaseline.py ...
WORKING_DIR=/tmp/rebaseline/after
TRUNK_DIR=$PWD
rm -rf $WORKING_DIR
mkdir -p $WORKING_DIR
pushd $WORKING_DIR
svn co -r 9314 --depth immediates http://skia.googlecode.com/svn/gm-expected .
python $TRUNK_DIR/tools/rebaseline.py verttext 
svn stat | sort >svn-stat
popd
diff -r --exclude=.* /tmp/rebaseline/before $WORKING_DIR

[Stephen White, 2013/05/29 16:45:52]

More my fault than yours, but we should probably add some tests for this before
it gets much bigger. :)

[epoger, 2013/05/29 17:09:35]

Good idea.  What would you think of this approach: adding a --dry_run flag that
would make the tool print out what it would do, without actually doing it. 
(Otherwise, I'm not sure how we could make a test that wouldn't hit SVN)

 
 '''
 Copyright 2012 Google Inc.
 
 Use of this source code is governed by a BSD-style license that can be
 found in the LICENSE file.
 '''
 
 '''
 Rebaselines the given GM tests, on all bots and all configurations.
 Must be run from the gm-expected directory.  If run from a git or SVN
 checkout, the files will be added to the staging area for commit.
 '''
 
-import os, subprocess, sys, tempfile
+import os
+import subprocess
+import sys
+import tempfile
 
-pairs = [ 
-   ['base-shuttle-win7-intel-float',
-    'Test-Win7-ShuttleA-HD2000-x86-Release'],
-   ['base-shuttle-win7-intel-angle',
-    'Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE'],
-   ['base-shuttle-win7-intel-directwrite',
-    'Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite'],
-   ['base-shuttle_ubuntu12_ati5770',
-    'Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release'],
-   ['base-macmini',
-    'Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release'],
-   ['base-macmini-lion-float',
-    'Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release'],
-   ['base-android-galaxy-nexus',
-    'Test-Android-GalaxyNexus-SGX540-Arm7-Debug'],
-   ['base-android-nexus-7',
-    'Test-Android-Nexus7-Tegra3-Arm7-Release'],
-   ['base-android-nexus-s',
-    'Test-Android-NexusS-SGX540-Arm7-Release'],
-   ['base-android-xoom',
-    'Test-Android-Xoom-Tegra2-Arm7-Release'],
-   ['base-android-nexus-10',
-    'Test-Android-Nexus10-MaliT604-Arm7-Release'],
-]
+# Mapping of gm-expectations subdir (under
+# https://skia.googlecode.com/svn/gm-expected/ )
+# to builder name (see list at http://108.170.217.252:10117/builders )
+subdir_mapping = {
+   'base-shuttle-win7-intel-float':

[epoger, 2013/05/29 16:19:37]

Using a mapping, instead of a list of tuples, will make it easier to add an
optional parameter selecting a subset of expectations subdirs to rebaseline
(instead of all of them).

+    'Test-Win7-ShuttleA-HD2000-x86-Release',
+   'base-shuttle-win7-intel-angle':
+    'Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE',
+   'base-shuttle-win7-intel-directwrite':
+    'Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite',
+   'base-shuttle_ubuntu12_ati5770':
+    'Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release',
+   'base-macmini':
+    'Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release',
+   'base-macmini-lion-float':
+    'Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release',
+   'base-android-galaxy-nexus':
+    'Test-Android-GalaxyNexus-SGX540-Arm7-Debug',
+   'base-android-nexus-7':
+    'Test-Android-Nexus7-Tegra3-Arm7-Release',
+   'base-android-nexus-s':
+    'Test-Android-NexusS-SGX540-Arm7-Release',
+   'base-android-xoom':
+    'Test-Android-Xoom-Tegra2-Arm7-Release',
+   'base-android-nexus-10':
+    'Test-Android-Nexus10-MaliT604-Arm7-Release',
+}
+
+IS_SVN_CHECKOUT = (os.path.exists('.svn') or
+                   os.path.exists(os.path.join('..', '.svn')))
+IS_GIT_CHECKOUT = (os.path.exists('.git') or
+                   os.path.exists(os.path.join('..', '.git')))
+
+
+# Rebaseline a single file.
+def RebaselineOneFile(expectations_subdir, builder_name,
+                      infilename, outfilename):
+    url = ('http://skia-autogen.googlecode.com/svn/gm-actual/' +
+           expectations_subdir + '/' + builder_name + '/' +
+           expectations_subdir + '/' + infilename)
+    cmd = [ 'curl', '--fail', '--silent', url ]
+    temp = tempfile.NamedTemporaryFile()
+    ret = subprocess.call(cmd, stdout=temp)
+    if ret != 0:
+        print 'Couldn\'t fetch ' + url
+        return
+    cmd = [ 'cp', temp.name, outfilename ]
+    subprocess.call(cmd);
+    if IS_SVN_CHECKOUT:
+        cmd = [ 'svn', 'add', '--quiet', outfilename ]
+        subprocess.call(cmd)
+        cmd = [ 'svn', 'propset', '--quiet', 'svn:mime-type', 'image/png',
+                outfilename ];
+        subprocess.call(cmd)
+    elif IS_GIT_CHECKOUT:
+        cmd = [ 'git', 'add', outfilename ]
+        subprocess.call(cmd)
+
+
+# Rebaseline all testtypes for a single test.
+def RebaselineOneTest(expectations_subdir, builder_name, testname):
+    if (expectations_subdir == 'base-shuttle-win7-intel-angle'):
+        testtypes = [ 'angle', 'anglemsaa16' ]
+    else:
+        testtypes = [ '565', '8888', 'gpu', 'pdf', 'mesa', 'msaa16', 'msaa4' ]
+    print expectations_subdir + ':'
+    for testtype in testtypes:
+        infilename = testname + '_' + testtype + '.png'
+        print infilename
+        outfilename = os.path.join(expectations_subdir, infilename);
+        RebaselineOneFile(expectations_subdir=expectations_subdir,
+                          builder_name=builder_name,
+                          infilename=infilename,
+                          outfilename=outfilename)
+
+
 
 if len(sys.argv) < 2:
-    print 'Usage:  ' + os.path.basename(sys.argv[0]) + ' <testname> '
-    '[ <testname> ... ]'
+    print ('Usage:  ' + os.path.basename(sys.argv[0]) +
+           ' <testname> [ <testname> ... ]')
     exit(1)
 
-is_svn_checkout = os.path.exists('.svn') or os.path.exists(os.path.join('..', '.svn') )
-is_git_checkout = os.path.exists('.git') or os.path.exists(os.path.join('..', '.git'))
-
 for testname in sys.argv[1:]:
-    for pair in pairs:
-        if (pair[0] == 'base-shuttle-win7-intel-angle'):
-            testtypes = [ 'angle', 'anglemsaa16' ]
-        else:
-            testtypes = [ '565', '8888', 'gpu', 'pdf', 'mesa', 'msaa16', 'msaa4' ]
-        print pair[0] + ':'
-        for testtype in testtypes:
-            infilename = testname + '_' + testtype + '.png'
-            print infilename
-
-            url = 'http://skia-autogen.googlecode.com/svn/gm-actual/' + pair[0] + '/' + pair[1] + '/' + pair[0] + '/' + infilename
-            cmd = [ 'curl', '--fail', '--silent', url ]
-            temp = tempfile.NamedTemporaryFile()
-            ret = subprocess.call(cmd, stdout=temp)
-            if ret != 0:
-                print 'Couldn\'t fetch ' + url
-                continue
-            outfilename = os.path.join(pair[0], infilename);
-            cmd = [ 'cp', temp.name, outfilename ]
-            subprocess.call(cmd);
-            if is_svn_checkout:
-                cmd = [ 'svn', 'add', '--quiet', outfilename ]
-                subprocess.call(cmd)
-                cmd = [ 'svn', 'propset', '--quiet', 'svn:mime-type', 'image/png', outfilename ];
-                subprocess.call(cmd)
-            elif is_git_checkout:
-                cmd = [ 'git', 'add', outfilename ]
-                subprocess.call(cmd)
+    for expectations_subdir in subdir_mapping.keys():
+        builder_name = subdir_mapping[expectations_subdir]
+        RebaselineOneTest(expectations_subdir=expectations_subdir,
+                          builder_name=builder_name,
+                          testname=testname)