commit feb1321044e3b7be34f9c1d7dacf9881d99a7327
author Kristina Chodorow <kchodorow@google.com> Tue Jul 12 09:37:25 2016 +0000
committer Kristina Chodorow <kchodorow@google.com> Tue Jul 12 11:18:03 2016 +0000
tree 4fbfc539754ad7e32279cc165bc4042642eac52e
parent 522551715b7886a9f4ca8d58262106de6a213aff

Rollback of commit a3381b6ac136a0cab3ba86020c739fe16b42cee9.

*** Reason for rollback ***

Broke bazel_rules_test

See https://github.com/bazelbuild/bazel/issues/1501.

*** Original change description ***


Fix default for temporary directories to honor TMPDIR

...and only use the hard-coded "/tmp" as default for the default.
Note that is unchanged that blaze.rpcserver.tmpdir still overrides.

--
MOS_MIGRATED_REVID=127179462

src/main/java/com/google/devtools/build/lib/server/AfUnixServer.java

diff --git a/src/main/java/com/google/devtools/build/lib/server/AfUnixServer.java b/src/main/java/com/google/devtools/build/lib/server/AfUnixServer.java
index 8c5d316..f615d04 100644
--- a/src/main/java/com/google/devtools/build/lib/server/AfUnixServer.java
+++ b/src/main/java/com/google/devtools/build/lib/server/AfUnixServer.java
@@ -329,14 +329,7 @@
     // (All this extra complexity is just used in tests... *sigh*).
     if (socketFile.toString().length() >= 104) { // = UNIX_PATH_MAX
       Path socketLink = socketFile;
-      String tmpDirDefault = System.getenv("TMPDIR");
-      if (tmpDirDefault == null
-          || tmpDirDefault.length() > 104 - "/blaze-4294967296/server.socket".length()) {
-        // Default for unset TMPDIR, or if TMPDIR is so that the resulting
-        // path would be too long.
-        tmpDirDefault = "/tmp";
-      }
-      String tmpDir = System.getProperty("blaze.rpcserver.tmpdir", tmpDirDefault);
+      String tmpDir = System.getProperty("blaze.rpcserver.tmpdir", "/tmp");
       socketFile = createTempSocketDirectory(socketFile.getRelative(tmpDir)).
           getRelative("server.socket");
       LOG.info("Using symlinked socket at " + socketFile);