fix TEST_SOCKET_DIR on windows, do not override value from top-level in test/ (cherry...

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 2c3707c..7a08a51 100644 (file)
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -387,21 +387,24 @@ set(TEST_SEGFAULT_BINARY      ${CMAKE_BINARY_DIR}/bin/${IDE_BIN}test-segfault${E
 set(TEST_SLEEP_FOREVER_BINARY ${CMAKE_BINARY_DIR}/bin/${IDE_BIN}test-sleep-forever${EXT} CACHE STRING "Full path to test file test/test-sleep-forever in builddir" ${TEST_PATH_FORCE})
 
 #### Find socket directories
-if (NOT WIN32)
-    if (NOT $ENV{TMPDIR} STREQUAL "")
-        set (DBUS_SESSION_SOCKET_DIR $ENV{TMPDIR})
-    else (NOT $ENV{TMPDIR} STREQUAL "")
-        if (NOT $ENV{TEMP} STREQUAL "")
-            set (DBUS_SESSION_SOCKET_DIR $ENV{TEMP})
-        else (NOT $ENV{TEMP} STREQUAL "")
-            if (NOT $ENV{TMP} STREQUAL "")
-                set (DBUS_SESSION_SOCKET_DIR $ENV{TMP})
-            else (NOT $ENV{TMP} STREQUAL "")
-                set (DBUS_SESSION_SOCKET_DIR /tmp)
-            endif (NOT $ENV{TMP} STREQUAL "")
-        endif (NOT $ENV{TEMP} STREQUAL "")
-    endif (NOT $ENV{TMPDIR} STREQUAL "")
-endif (NOT WIN32)
+ if (NOT $ENV{TMPDIR} STREQUAL "")
+     set (DBUS_SESSION_SOCKET_DIR $ENV{TMPDIR})
+ else (NOT $ENV{TMPDIR} STREQUAL "")
+     if (NOT $ENV{TEMP} STREQUAL "")
+         set (DBUS_SESSION_SOCKET_DIR $ENV{TEMP})
+     else (NOT $ENV{TEMP} STREQUAL "")
+         if (NOT $ENV{TMP} STREQUAL "")
+             set (DBUS_SESSION_SOCKET_DIR $ENV{TMP})
+         else (NOT $ENV{TMP} STREQUAL "")
+         if (WIN32)
+             #Should never happen, both TMP and TEMP seem always set on Windows
+             message(FATAL "Could not determine a usable temporary directory")
+         else(WIN32)
+            set (DBUS_SESSION_SOCKET_DIR /tmp)
+         endif(WIN32)
+         endif (NOT $ENV{TMP} STREQUAL "")
+     endif (NOT $ENV{TEMP} STREQUAL "")
+ endif (NOT $ENV{TMPDIR} STREQUAL "")
 
 #AC_ARG_WITH(test-socket-dir, AS_HELP_STRING([--with-test-socket-dir=[dirname]],[Where to put sockets for make check]))
 

diff --git a/cmake/test/CMakeLists.txt b/cmake/test/CMakeLists.txt
index c0c9bc7..7011d31 100644 (file)
--- a/cmake/test/CMakeLists.txt
+++ b/cmake/test/CMakeLists.txt
@@ -21,8 +21,6 @@ if (WIN32)
 add_definitions(-Dsleep=_sleep)
 endif (WIN32)
 
-set (TEST_SOCKET_DIR "/")
-
 #if (DBUS_BUILD_TESTS)
 ## break-loader removed for now
 #test-BINARIES=test-service test-names test-shell-service shell-test spawn-test test-segfault test-exit test-sleep-forever