Merge "devtools/presubmit: enable TestPresubmitTest."
diff --git a/jiri-profile-v23/android_profile/android.go b/jiri-profile-v23/android_profile/android.go
index c9ad239..58d27f6 100644
--- a/jiri-profile-v23/android_profile/android.go
+++ b/jiri-profile-v23/android_profile/android.go
@@ -300,7 +300,7 @@
if err != nil {
return target, err
}
- defer jirix.NewSeq().RemoveAll(tmpDir).Done()
+ defer jirix.NewSeq().RemoveAll(tmpDir)
outDir := m.platformRoot.Abs(jirix)
target.Env.Set("ANDROID_PLATFORM_TOOLS=" + m.platformRoot.Symbolic())
@@ -330,7 +330,7 @@
if err != nil {
return target, err
}
- defer jirix.NewSeq().RemoveAll(tmpDir).Done()
+ defer jirix.NewSeq().RemoveAll(tmpDir)
env := envvar.VarsFromMap(jirix.Env())
profilesreader.MergeEnv(profilesreader.ProfileMergePolicies(), env, baseEnv)
diff --git a/jiri-profile-v23/dart_profile/dart.go b/jiri-profile-v23/dart_profile/dart.go
index d4fe191..12ff5e7 100644
--- a/jiri-profile-v23/dart_profile/dart.go
+++ b/jiri-profile-v23/dart_profile/dart.go
@@ -104,7 +104,7 @@
if err != nil {
return err
}
- defer jirix.NewSeq().RemoveAll(tmpDir).Done()
+ defer jirix.NewSeq().RemoveAll(tmpDir)
fn := func() error {
sdkUrl := dartSdkUrl(m.spec.dartSdkChannel, m.spec.dartSdkVersion, target.OS())
diff --git a/jiri-profile-v23/go_profile/darwin_xcompile.go b/jiri-profile-v23/go_profile/darwin_xcompile.go
index 9d9338c..1610e34 100644
--- a/jiri-profile-v23/go_profile/darwin_xcompile.go
+++ b/jiri-profile-v23/go_profile/darwin_xcompile.go
@@ -276,7 +276,7 @@
if err != nil {
return err
}
- defer jirix.NewSeq().RemoveAll(tmpDir).Done()
+ defer jirix.NewSeq().RemoveAll(tmpDir)
return s.Pushd(tmpDir).
Run(downloadCmd[0], downloadCmd[1:]...).
Run(unpackCmd[0], unpackCmd[1:]...).
diff --git a/jiri-profile-v23/go_profile/go.go b/jiri-profile-v23/go_profile/go.go
index 011ff7f..a838b39 100644
--- a/jiri-profile-v23/go_profile/go.go
+++ b/jiri-profile-v23/go_profile/go.go
@@ -220,7 +220,7 @@
if err != nil {
return err
}
- defer jirix.NewSeq().RemoveAll(tmpDir).Done()
+ defer jirix.NewSeq().RemoveAll(tmpDir)
name := "go1.4.2.src.tar.gz"
remote, local := "https://storage.googleapis.com/golang/"+name, filepath.Join(tmpDir, name)
@@ -258,7 +258,7 @@
if err != nil {
return err
}
- defer jirix.NewSeq().RemoveAll(tmpDir).Done()
+ defer jirix.NewSeq().RemoveAll(tmpDir)
goInstDir := m.goInstDir.Abs(jirix)
goSrcDir := filepath.Join(goInstDir, "src")
diff --git a/jiri-profile-v23/mojo_profile/mojo.go b/jiri-profile-v23/mojo_profile/mojo.go
index 2c198b8..0639d43 100644
--- a/jiri-profile-v23/mojo_profile/mojo.go
+++ b/jiri-profile-v23/mojo_profile/mojo.go
@@ -338,7 +338,7 @@
if err != nil {
return err
}
- defer jirix.NewSeq().RemoveAll(tmpDir).Done()
+ defer jirix.NewSeq().RemoveAll(tmpDir)
fn := func() error {
androidPlatformToolsZipFile := filepath.Join(tmpDir, "platform-tools.zip")
@@ -360,7 +360,7 @@
if err != nil {
return err
}
- defer jirix.NewSeq().RemoveAll(tmpDir).Done()
+ defer jirix.NewSeq().RemoveAll(tmpDir)
networkServiceUrl := mojoNetworkServiceUrl(m.platform, m.spec.networkServiceVersion)
networkServiceZipFile := filepath.Join(tmpDir, "network_service.mojo.zip")
@@ -414,7 +414,7 @@
if err != nil {
return err
}
- defer jirix.NewSeq().RemoveAll(tmpMojoCheckout).Done()
+ defer jirix.NewSeq().RemoveAll(tmpMojoCheckout)
seq.
Pushd(tmpMojoCheckout).
@@ -480,7 +480,7 @@
if err != nil {
return err
}
- defer jirix.NewSeq().RemoveAll(tmpDir).Done()
+ defer jirix.NewSeq().RemoveAll(tmpDir)
fn := func() error {
seq := jirix.NewSeq()
diff --git a/jiri-profile-v23/nacl_profile/nacl.go b/jiri-profile-v23/nacl_profile/nacl.go
index 310ccb1..90e9f61 100644
--- a/jiri-profile-v23/nacl_profile/nacl.go
+++ b/jiri-profile-v23/nacl_profile/nacl.go
@@ -146,7 +146,7 @@
if err != nil {
return err
}
- defer jirix.NewSeq().RemoveAll(tmpDir).Done()
+ defer jirix.NewSeq().RemoveAll(tmpDir)
return s.Pushd(tmpDir).
Call(func() error { return gitutil.New(jirix.NewSeq()).CloneRecursive(gitRemote, tmpDir) }, "").
Call(func() error { return gitutil.New(jirix.NewSeq()).Reset(m.spec.gitRevision) }, "").
