Mirrors/libwebsockets
1
0
Fork 0
mirror of https://github.com/warmcat/libwebsockets.git synced 2025-03-30 00:00:16 +01:00
Code Issues Releases Wiki Activity

Subject: [PATCH] BUGFIX: Failed to get proper output dir for test-server

Browse source 
When creating the directory where to put the files needed by the test-server CMake would fail because it tried to create the directory /../share/libwebsockets-test-server, which is not possible. This happens since the TARGET_FILE_DIR for the test-server is not fetched properly.

Also mentioned in this trac ticket:
http://libwebsockets.org/trac/libwebsockets/ticket/84
This commit is contained in:
Joakim Soderberg 2014-10-14 15:24:31 +02:00 • committed by Andy Green
parent 4076a2c8bc
commit bf3e8a998e
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CMakeLists.txt
View file

@ -685,7 +685,9 @@ if (NOT LWS_WITHOUT_TESTAPPS)
add_custom_command(TARGET test-server add_custom_command(TARGET test-server
POST_BUILD POST_BUILD
COMMAND "${CMAKE_COMMAND}" -E make_directory "$<TARGET_FILE_DIR:test-server>/../share/libwebsockets-test-server") COMMAND "${CMAKE_COMMAND}" -E make_directory "$<TARGET_FILE_DIR:test-server>/../share/libwebsockets-test-server"
COMMENT "Creating test-server $<TARGET_FILE_DIR:test-server> share directory"
VERBATIM)
# Copy the file needed to run the server so that the test apps can # Copy the file needed to run the server so that the test apps can
# reach them from their default output location # reach them from their default output location
@ -693,7 +695,9 @@ if (NOT LWS_WITHOUT_TESTAPPS)
if (EXISTS ${TEST_FILE}) if (EXISTS ${TEST_FILE})
add_custom_command(TARGET test-server add_custom_command(TARGET test-server
POST_BUILD POST_BUILD
COMMAND "${CMAKE_COMMAND}" -E copy "${TEST_FILE}" "$<TARGET_FILE_DIR:test-server>/../share/libwebsockets-test-server" VERBATIM) COMMAND "${CMAKE_COMMAND}" -E copy "${TEST_FILE}" "$<TARGET_FILE_DIR:test-server>/../share/libwebsockets-test-server"
COMMENT "Copying test-server files"
VERBATIM)
endif() endif()
endforeach() endforeach()
endif(NOT LWS_WITHOUT_SERVER) endif(NOT LWS_WITHOUT_SERVER)

2
test-server/test-server.c
View file

@ -876,6 +876,8 @@ int main(int argc, char **argv)
lwsl_notice("libwebsockets test server - " lwsl_notice("libwebsockets test server - "
"(C) Copyright 2010-2014 Andy Green <andy@warmcat.com> - " "(C) Copyright 2010-2014 Andy Green <andy@warmcat.com> - "
"licensed under LGPL2.1\n"); "licensed under LGPL2.1\n");
printf("Using resource path \"%s\"\n", resource_path);
#ifdef EXTERNAL_POLL #ifdef EXTERNAL_POLL
max_poll_elements = getdtablesize(); max_poll_elements = getdtablesize();
pollfds = malloc(max_poll_elements * sizeof (struct pollfd)); pollfds = malloc(max_poll_elements * sizeof (struct pollfd));