Browse Source

#712 Try to fix Windows

Signed-off-by: Uilian Ries <uilianries@gmail.com>
Uilian Ries 6 years ago
parent
commit
a44e0f5938
2 changed files with 6 additions and 4 deletions
  1. 2 2
      .travis.yml
  2. 4 2
      conan/test_package/conanfile.py

+ 2 - 2
.travis.yml

@@ -161,6 +161,8 @@ matrix:
   fast_finish: false
   fast_finish: false
   include:
   include:
 
 
+  - <<: *conan-linux
+    env: CONAN_GCC_VERSIONS=5 CONAN_DOCKER_IMAGE=conanio/gcc5 CONAN_DOCKER_32_IMAGES=1
   - <<: *conan-osx
   - <<: *conan-osx
     osx_image: xcode8.3
     osx_image: xcode8.3
     env: CONAN_APPLE_CLANG_VERSIONS=8.1
     env: CONAN_APPLE_CLANG_VERSIONS=8.1
@@ -176,8 +178,6 @@ matrix:
   - <<: *conan-linux
   - <<: *conan-linux
     env: CONAN_GCC_VERSIONS=4.9 CONAN_DOCKER_IMAGE=conanio/gcc49 CONAN_DOCKER_32_IMAGES=1
     env: CONAN_GCC_VERSIONS=4.9 CONAN_DOCKER_IMAGE=conanio/gcc49 CONAN_DOCKER_32_IMAGES=1
   - <<: *conan-linux
   - <<: *conan-linux
-    env: CONAN_GCC_VERSIONS=5 CONAN_DOCKER_IMAGE=conanio/gcc5 CONAN_DOCKER_32_IMAGES=1
-  - <<: *conan-linux
     env: CONAN_GCC_VERSIONS=6 CONAN_DOCKER_IMAGE=conanio/gcc6 CONAN_DOCKER_32_IMAGES=1
     env: CONAN_GCC_VERSIONS=6 CONAN_DOCKER_IMAGE=conanio/gcc6 CONAN_DOCKER_32_IMAGES=1
   - <<: *conan-linux
   - <<: *conan-linux
     env: CONAN_GCC_VERSIONS=7 CONAN_DOCKER_IMAGE=conanio/gcc7 CONAN_DOCKER_32_IMAGES=1
     env: CONAN_GCC_VERSIONS=7 CONAN_DOCKER_IMAGE=conanio/gcc7 CONAN_DOCKER_32_IMAGES=1

+ 4 - 2
conan/test_package/conanfile.py

@@ -21,9 +21,11 @@ class TestPackageConan(ConanFile):
         bin_path = os.path.join("bin", "test_package")
         bin_path = os.path.join("bin", "test_package")
         run_vars = RunEnvironment(self).vars
         run_vars = RunEnvironment(self).vars
         with tools.environment_append(run_vars):
         with tools.environment_append(run_vars):
-            if self.settings.os == "Macos":
+            if self.settings.os == "Macos" or self.settings.os == "Linux":
                 run_vars["DYLD_LIBRARY_PATH"] = os.environ.get('DYLD_LIBRARY_PATH', '')
                 run_vars["DYLD_LIBRARY_PATH"] = os.environ.get('DYLD_LIBRARY_PATH', '')
-            process = subprocess.Popen([bin_path], shell=True, env=run_vars)
+                process = subprocess.Popen([bin_path], shell=True, env=run_vars)
+            else:
+                process = subprocess.Popen([bin_path], shell=True)
             time.sleep(3)
             time.sleep(3)
             response = requests.get("http://localhost:8080/example")
             response = requests.get("http://localhost:8080/example")
             assert response.ok
             assert response.ok