diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2014-10-24 14:01:13 -0700 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2014-10-24 14:01:13 -0700 |
| commit | a747ea49c9eb6d453c7bf3cfa3465ec0a20616d2 (patch) | |
| tree | 3449db490e0f5752a143c6020a35eb3b6d7e91b0 | |
| parent | cdfd2b62b763d9aeca5992b390ec461548e7f47a (diff) | |
| parent | 29eed1c74d65efbad48aa525f551c6f94d04002c (diff) | |
| download | libgit2-a747ea49c9eb6d453c7bf3cfa3465ec0a20616d2.tar.gz | |
Merge pull request #2647 from ethomson/clar_tmpname
clar: use a custom temp directory name
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/clar/sandbox.h | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 46b82440b..22b6561c6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -455,6 +455,7 @@ IF (BUILD_CLAR) SET(CLAR_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/tests/resources" CACHE PATH "Path to test resources.") ADD_DEFINITIONS(-DCLAR_FIXTURE_PATH=\"${CLAR_FIXTURES}\") ADD_DEFINITIONS(-DCLAR_RESOURCES=\"${TEST_RESOURCES}\") + ADD_DEFINITIONS(-DCLAR_TMPDIR=\"libgit2_tests\") INCLUDE_DIRECTORIES(${CLAR_PATH}) FILE(GLOB_RECURSE SRC_TEST ${CLAR_PATH}/*/*.c ${CLAR_PATH}/*/*.h) diff --git a/tests/clar/sandbox.h b/tests/clar/sandbox.h index a44e29116..ea9e35ca9 100644 --- a/tests/clar/sandbox.h +++ b/tests/clar/sandbox.h @@ -72,7 +72,12 @@ static void clar_unsandbox(void) static int build_sandbox_path(void) { +#ifdef CLAR_TMPDIR + const char path_tail[] = CLAR_TMPDIR "_XXXXXX"; +#else const char path_tail[] = "clar_tmp_XXXXXX"; +#endif + size_t len; if (find_tmp_path(_clar_path, sizeof(_clar_path)) < 0) |