Update the verification script to reflect git 2.9.1 changes

git 2.9.1 changed the "working directory" message to "working
 tree". Accept both statements in the verification script.

Ref:
https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.9.1.txt

Fixes #559

Change-Id: Ie90097d39e1f09c1796bb1238ee92bf19aff93bf

diff --git a/external/vulkancts/verify_submission.py b/external/vulkancts/verify_submission.py
index 338bdae..36fd403 100644 (file)
--- a/external/vulkancts/verify_submission.py
+++ b/external/vulkancts/verify_submission.py
@@ -209,7 +209,7 @@ def verifyGitStatus (package):
                statusPath      = os.path.join(package.basePath, package.gitStatus)
                status          = readFile(statusPath)
 
-               if status.find("nothing to commit, working directory clean") < 0:
+               if status.find("nothing to commit, working directory clean") < 0 and status.find("nothing to commit, working tree clean") < 0:
                        messages.append(error(package.basePath, "Working directory is not clean"))
        else:
                messages.append(error(package.basePath, "Missing git-status.txt"))