Commit 9f36b676 authored by Frank Osterfeld's avatar Frank Osterfeld Committed by Ralf Habacker

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

fix TEST_SOCKET_DIR on windows, do not override value from top-level in test/ (cherry picked from commit fde144333281348cda2d533331946996d7a09bff)
parent c263a6df
......@@ -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]))
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment