Przeglądaj źródła

Try to correct build scripts

bel 9 lat temu
rodzic
commit
500e8ff36a
3 zmienionych plików z 19 dodań i 8 usunięć
  1. 1 1
      .travis.yml
  2. 1 7
      appveyor.yml
  3. 17 0
      test/public_server.c

+ 1 - 1
.travis.yml

@@ -2481,5 +2481,5 @@ script:
 # Coveralls options: https://github.com/eddyxu/cpp-coveralls/blob/master/README.md
 after_success:
   - if [ "${BUILD_TYPE}" == "Coverage" -a "${TRAVIS_OS_NAME}" == "linux" ]; then
-      coveralls --include src --exclude src/main.c --include include --gcov-options '\-lp' --root .. --build-root .;
+      coveralls --include src --exclude src/main.c --exclude src/third_party --include include --gcov-options '\-lp' --root .. --build-root .;
     fi

+ 1 - 7
appveyor.yml

@@ -109,7 +109,7 @@ install:
   # - http://help.appveyor.com/discussions/questions/1132-openssl-installation-issues
   # - https://github.com/appveyor/ci/issues/576
   #
-  - cmd: set PATH=%PATH%;C:\OpenSSL-Win32;C:\OpenSSL-Win64;%build_path%
+  - cmd: set PATH=%PATH%;C:\OpenSSL-Win32;C:\OpenSSL-Win64
   - dir C:\OpenSSL-Win32
   - dir C:\OpenSSL-Win64
   - path
@@ -198,12 +198,6 @@ build_script:
 
 test_script:
   - cd "%build_path%"
-  - cmd /c copy C:\OpenSSL-Win32\libeay32.dll libeay32.dll
-  - cmd /c copy C:\OpenSSL-Win32\libssl32.dll libssl32.dll
-  - cmd /c copy C:\OpenSSL-Win32\ssleay32.dll ssleay32.dll
-  - cmd /c copy C:\OpenSSL-Win64\libeay32.dll libeay64.dll
-  - cmd /c copy C:\OpenSSL-Win64\libssl32.dll libssl64.dll
-  - cmd /c copy C:\OpenSSL-Win64\ssleay32.dll ssleay64.dll
   - appveyor AddMessage -Category Information "Test command '%build%'"
   - set CTEST_OUTPUT_ON_FAILURE=1
   - cmd /c "%test%"

+ 17 - 0
test/public_server.c

@@ -194,6 +194,23 @@ START_TEST(test_the_test_environment)
 	if (ret) {
 		fprintf(stderr, "%s not found", buf);
 	}
+
+
+#ifdef _WIN32
+/* Try to copy the files required for AppVeyor */
+#if defined(_WIN64) || defined(__MINGW64__)
+	system("cmd /c copy C:\OpenSSL-Win64\libeay32.dll libeay32.dll");
+	system("cmd /c copy C:\OpenSSL-Win64\libssl32.dll libssl32.dll");
+	system("cmd /c copy C:\OpenSSL-Win64\ssleay32.dll ssleay32.dll");
+	system("cmd /c copy C:\OpenSSL-Win64\libeay32.dll libeay64.dll");
+	system("cmd /c copy C:\OpenSSL-Win64\libssl32.dll libssl64.dll");
+	system("cmd /c copy C:\OpenSSL-Win64\ssleay32.dll ssleay64.dll");
+#else
+	system("cmd /c copy C:\OpenSSL-Win32\libeay32.dll libeay32.dll");
+	system("cmd /c copy C:\OpenSSL-Win32\libssl32.dll libssl32.dll");
+	system("cmd /c copy C:\OpenSSL-Win32\ssleay32.dll ssleay32.dll");
+#endif
+#endif
 }
 END_TEST