TS-1839 Change Layout initialization, such that if the install directory doesn't exist, we just give a warning. This fixes the problem where e.g. make test fails.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/dba01ebb Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/dba01ebb Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/dba01ebb Branch: refs/heads/sphinx-docs Commit: dba01ebb6fcb060491330efb9c051d17963cc683 Parents: 1250c7c Author: Leif Hedstrom <[email protected]> Authored: Fri Apr 26 20:32:04 2013 -0600 Committer: Leif Hedstrom <[email protected]> Committed: Fri Apr 26 20:32:04 2013 -0600 ---------------------------------------------------------------------- CHANGES | 3 +++ lib/ts/Layout.cc | 7 +++---- 2 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/dba01ebb/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index e13b24a..76200e2 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,9 @@ Changes with Apache Traffic Server 3.3.3 + *) [TS-1839] We fail "make test" on some platforms, due to install + directory missing. + *) [TS-1856] Replace SIZE() macro with COUNTOF() and countof(). *) [TS-1853] Fix formatting in logstats to be consistenly 2 decimals. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/dba01ebb/lib/ts/Layout.cc ---------------------------------------------------------------------- diff --git a/lib/ts/Layout.cc b/lib/ts/Layout.cc index 0ca75d2..d1001cb 100644 --- a/lib/ts/Layout.cc +++ b/lib/ts/Layout.cc @@ -159,10 +159,6 @@ Layout::Layout(const char *_prefix) ink_strlcpy(path, TS_BUILD_PREFIX, sizeof(path)); } - if (access(path, R_OK) == -1) { - ink_error("unable to access() TS_ROOT '%s': %d, %s\n", path, errno, strerror(errno)); - return; - } prefix = ats_strdup(path); } exec_prefix = layout_relative(prefix, TS_BUILD_EXEC_PREFIX); @@ -204,6 +200,9 @@ Layout::Layout(const char *_prefix) PrintSTR(cachedir); #endif + if (access(prefix, F_OK) == -1) { + ink_error("unable to access() TS_ROOT '%s': %d, %s\n", prefix, errno, strerror(errno)); + } } Layout::~Layout()
