Explorar el Código

[Travis] Set DISPLAY correctly in the driver script.

Sascha Zelzer hace 11 años
padre
commit
2eb331dc7e
Se han modificado 2 ficheros con 2 adiciones y 3 borrados
  1. 1 2
      .travis.yml
  2. 1 1
      CMake/ctkTravisDashboardScript.cmake

+ 1 - 2
.travis.yml

@@ -3,8 +3,6 @@ language: cpp
 compiler:
   - gcc
 
-env: DISPLAY=:9
-
 branches:
   only:
     - travis-ci
@@ -23,5 +21,6 @@ script: ctest -V -S ./CMake/ctkTravisDashboardScript.cmake
 after_script:
   - xpra stop :9
   - ldd -r /tmp/CTK-Superbuild-Release-experimental/CMakeExternals/Install/bin/storescu
+  - ls -l /tmp/CTK-Superbuild-Release-experimental/CMakeExternals/Install/lib
   - chrpath -l /tmp/CTK-Superbuild-Release-experimental/CMakeExternals/Install/bin/storescu
   - "cat ~/.xpra/*"

+ 1 - 1
CMake/ctkTravisDashboardScript.cmake

@@ -109,7 +109,7 @@ CTK_LIB_DICOM/Core:BOOL=ON
 set(TEST_TO_EXCLUDE_REGEX "")
 
 # set any extra environment variables here
-set(ENV{DISPLAY} ":0")
+set(ENV{DISPLAY} ":9")
 
 find_program(CTEST_COVERAGE_COMMAND NAMES gcov)
 find_program(CTEST_MEMORYCHECK_COMMAND NAMES valgrind)