ui-tests: create the Git worktree as part of SetWorkTree()

And likewise, have a tear-down function (CleanUpWorkTree()).

Signed-off-by: Johannes Schindelin <[email protected]>

Author: dscho

ui-tests/background-hook.ahk

@@ -13,18 +13,6 @@
 
 SetWorkTree('git-test-background-hook')
 
-SetWorkingDir(EnvGet('TEMP'))
-Info 'uname: ' RunWaitOne('uname -a')
-Info RunWaitOne('git version --build-options')
-
-RunWait('git init "' workTree '"', '', 'Hide')
-if A_LastError
-    ExitWithError 'Could not initialize Git worktree at: ' workTree
-
-SetWorkingDir(workTree)
-if A_LastError
-    ExitWithError 'Could not set working directory to: ' workTree
-
 if not FileExist('.git/hooks') and not DirCreate('.git/hooks')
     ExitWithError 'Could not create hooks directory: ' workTree
 
@@ -70,5 +58,4 @@ Info('Match!')
 Send('^C')
 Send('exit{Enter}')
 Sleep 50
-SetWorkingDir(EnvGet('TEMP'))
-DirDelete(workTree, true)
+CleanUpWorkTree()

ui-tests/ui-test-library.ahk

@@ -18,6 +18,25 @@ SetWorkTree(defaultName) {
             workTree := workTree '-' counter
         }
     }
+
+    SetWorkingDir(EnvGet('TEMP'))
+    Info 'uname: ' RunWaitOne('uname -a')
+    Info RunWaitOne('git version --build-options')
+
+    RunWait('git init "' workTree '"', '', 'Hide')
+    if A_LastError
+        ExitWithError 'Could not initialize Git worktree at: ' workTree
+
+    SetWorkingDir(workTree)
+    if A_LastError
+        ExitWithError 'Could not set working directory to: ' workTree
+}
+
+CleanUpWorkTree() {
+    global workTree
+    SetWorkingDir(EnvGet('TEMP'))
+    Info 'Cleaning up worktree: ' workTree
+    DirDelete(workTree, true)
 }
 
 Info(text) {