Переглянути джерело

#712 Fix run environment

Signed-off-by: Uilian Ries <uilianries@gmail.com>
Uilian Ries 6 роки тому
батько
коміт
c3a7b2d3f1
3 змінених файлів з 18 додано та 16 видалено
  1. 12 12
      .travis.yml
  2. 1 2
      appveyor.yml
  3. 5 2
      conan/test_package/conanfile.py

+ 12 - 12
.travis.yml

@@ -161,6 +161,18 @@ matrix:
   fast_finish: false
   include:
 
+  - <<: *conan-osx
+    osx_image: xcode8.3
+    env: CONAN_APPLE_CLANG_VERSIONS=8.1
+  - <<: *conan-osx
+    osx_image: xcode9
+    env: CONAN_APPLE_CLANG_VERSIONS=9.0
+  - <<: *conan-osx
+    osx_image: xcode9.4
+    env: CONAN_APPLE_CLANG_VERSIONS=9.1
+  - <<: *conan-osx
+    osx_image: xcode10.1
+    env: CONAN_APPLE_CLANG_VERSIONS=10.0
   - <<: *conan-linux
     env: CONAN_GCC_VERSIONS=4.9 CONAN_DOCKER_IMAGE=conanio/gcc49 CONAN_DOCKER_32_IMAGES=1
   - <<: *conan-linux
@@ -179,18 +191,6 @@ matrix:
     env: CONAN_CLANG_VERSIONS=5.0 CONAN_DOCKER_IMAGE=conanio/clang50 CONAN_DOCKER_32_IMAGES=1
   - <<: *conan-linux
     env: CONAN_CLANG_VERSIONS=6.0 CONAN_DOCKER_IMAGE=conanio/clang60 CONAN_DOCKER_32_IMAGES=1
-  - <<: *conan-osx
-    osx_image: xcode8.3
-    env: CONAN_APPLE_CLANG_VERSIONS=8.1
-  - <<: *conan-osx
-    osx_image: xcode9
-    env: CONAN_APPLE_CLANG_VERSIONS=9.0
-  - <<: *conan-osx
-    osx_image: xcode9.4
-    env: CONAN_APPLE_CLANG_VERSIONS=9.1
-  - <<: *conan-osx
-    osx_image: xcode10.1
-    env: CONAN_APPLE_CLANG_VERSIONS=10.0
 
   - dist: trusty
     sudo: false

+ 1 - 2
appveyor.yml

@@ -492,5 +492,4 @@ for:
       - pip.exe install conan conan_package_tools
     build: false
     test_script:
-      - python conan/build.py
-    after_test: false
+      - python conan/build.py

+ 5 - 2
conan/test_package/conanfile.py

@@ -19,8 +19,11 @@ class TestPackageConan(ConanFile):
     def test(self):
         assert os.path.isfile(os.path.join(self.deps_cpp_info["civetweb"].rootpath, "licenses", "LICENSE.md"))
         bin_path = os.path.join(os.getcwd(), "bin", "test_package")
-        with tools.environment_append(RunEnvironment(self).vars):
-            process = subprocess.Popen([bin_path], shell=True)
+        run_vars = RunEnvironment(self).vars
+        with tools.environment_append(run_vars):
+            if self.settings.os == "Macos":
+                run_vars["DYLD_LIBRARY_PATH"] = os.environ.get('DYLD_LIBRARY_PATH', '')
+            process = subprocess.Popen([bin_path], shell=True, env=run_vars)
             time.sleep(2)
             response = requests.get("http://localhost:8080/example")
             assert response.ok