diff options
| author |  Changming Sun <chasun@microsoft.com> | 2017-11-20 05:34:25 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2017-11-20 05:35:49 -0800 |
| commit | d0bf589f2716b3d139c210930371a684c6e158eb (patch) | |
| tree | c16cac088ce5923b7210de9c14c17932beec0150 /src/test | |
| parent | c8be465869fbcfaa00b75d241c67279324976e0b (diff) | |
Add a random number to action temp dir
Fix for #4035
@laszlocsomor
Closes #4110.
PiperOrigin-RevId: 176346381
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/exec/local/LocalSpawnRunnerTest.java | 17 | ||||
| -rwxr-xr-x | src/test/shell/bazel/bazel_rules_test.sh | 2 |
2 files changed, 17 insertions, 2 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/exec/local/LocalSpawnRunnerTest.java b/src/test/java/com/google/devtools/build/lib/exec/local/LocalSpawnRunnerTest.java index 260debfbc1..c33c33cc2f 100644 --- a/src/test/java/com/google/devtools/build/lib/exec/local/LocalSpawnRunnerTest.java +++ b/src/test/java/com/google/devtools/build/lib/exec/local/LocalSpawnRunnerTest.java @@ -18,6 +18,7 @@ import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth8.assertThat; import static org.junit.Assert.fail; import static org.mockito.Matchers.any; +import static org.mockito.Matchers.argThat; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -45,6 +46,7 @@ import com.google.devtools.build.lib.util.OS; import com.google.devtools.build.lib.util.io.FileOutErr; import com.google.devtools.build.lib.vfs.FileSystem; import com.google.devtools.build.lib.vfs.FileSystemUtils; +import com.google.devtools.build.lib.vfs.Path; import com.google.devtools.build.lib.vfs.PathFragment; import com.google.devtools.build.lib.vfs.inmemoryfs.InMemoryFileSystem; import com.google.devtools.common.options.Options; @@ -68,6 +70,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; import org.mockito.ArgumentCaptor; +import org.mockito.ArgumentMatcher; /** * Unit tests for {@link LocalSpawnRunner}. @@ -514,7 +517,19 @@ public class LocalSpawnRunnerTest { .rewriteLocalEnv( any(), eq(fs.getPath("/execroot")), - eq(fs.getPath("/execroot/tmp1")), + argThat( + new ArgumentMatcher<Path>() { + @Override + public boolean matches(Object arg) { + if (!(arg instanceof Path)) { + return false; + } + return ((Path) arg) + .getPathString() + .matches("^/execroot/tmp[0-9a-fA-F]+_[0-9a-fA-F]+$"); + } + } + ), eq("product-name")); } diff --git a/src/test/shell/bazel/bazel_rules_test.sh b/src/test/shell/bazel/bazel_rules_test.sh index da50cc12cf..5e70ebb689 100755 --- a/src/test/shell/bazel/bazel_rules_test.sh +++ b/src/test/shell/bazel/bazel_rules_test.sh @@ -251,7 +251,7 @@ EOF || fail "Failed to build //pkg:test" assert_contains "PATH=$PATH_TO_BAZEL_WRAPPER:/bin:/usr/bin:/random/path" \ bazel-genfiles/pkg/test.out - assert_contains "TMPDIR=.*execroot.*tmp[0-9a-fA-F]\+$" \ + assert_contains "TMPDIR=.*execroot.*tmp[0-9a-fA-F]\+_[0-9a-fA-F]\+$" \ bazel-genfiles/pkg/test.out assert_not_contains "TMPDIR=.*newfancytmpdir" \ bazel-genfiles/pkg/test.out |