Просмотр исходного кода

add appveyor ci cmake definition

OlehKulykov 10 лет назад
Родитель
Сommit
2de016fb95

+ 5 - 1
CMakeLists.txt

@@ -55,6 +55,8 @@ option(RWS_OPT_SHARED "Build shared lib" ON)
 option(RWS_OPT_STATIC "Build static lib" ON)
 option(RWS_OPT_TESTS "Build librws tests" ON)
 
+option(RWS_OPT_APPVEYOR_CI "Build with appveyor ci" OFF)
+
 # C with -fPIC
 check_c_compiler_flag("-fPIC" WITH_FPIC_C)
 if(WITH_FPIC_C)
@@ -82,7 +84,9 @@ endif(MINGW)
 
 
 add_definitions(-DCMAKE_BUILD)
-
+if (RWS_OPT_APPVEYOR_CI)
+	add_definitions(-DRWS_APPVEYOR_CI)
+endif()
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 

+ 1 - 1
appveyor.yml

@@ -28,7 +28,7 @@ build_script:
   - cd c:\dev\librws
   - md build
   - cd build
-  - cmake -DCMAKE_INSTALL_PREFIX:PATH=c:\dev\librws\librws-install-dir  -DCMAKE_BUILD_TYPE=Release ..
+  - cmake -DRWS_OPT_APPVEYOR_CI=ON -DCMAKE_INSTALL_PREFIX:PATH=c:\dev\librws\librws-install-dir  -DCMAKE_BUILD_TYPE=Release ..
   - cmake --build . --config Release
   - cmake --build . --config Release --target Install
   - ctest

BIN
test/librws_test.xcodeproj/project.xcworkspace/xcuserdata/residentevil.xcuserdatad/UserInterfaceState.xcuserstate


+ 4 - 2
test/test_librws_creation.c

@@ -65,7 +65,7 @@ static void on_socket_connected(rws_socket socket)
 {
 	const char * test_send_text =
 	"{\"version\":\"1.0\",\"supportedConnectionTypes\":[\"websocket\"],\"minimumVersion\":\"1.0\",\"channel\":\"/meta/handshake\"}";
-	
+
 	printf("\nSocket connected");
 
 	rws_socket_send_text(socket, test_send_text);
@@ -97,8 +97,10 @@ int main(int argc, char* argv[])
 	rws_socket_set_on_received_text(_socket, &on_socket_received_text);
 	rws_socket_set_on_received_bin(_socket, &on_socket_received_bin);
 
+#if !defined(RWS_APPVEYOR_CI)
+	// connection denied for client applications
 	rws_socket_connect(_socket);
-
+#endif
 
 	// main loop here