From 4e956520143c83f63ef24379aa085054ac15df95 Mon Sep 17 00:00:00 2001 From: Rodney Dawes Date: Mon, 27 Mar 2017 16:12:23 -0400 Subject: Disable integration tests when running under jenkins environment for now. --- tests/integration/CMakeLists.txt | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tests/integration/CMakeLists.txt b/tests/integration/CMakeLists.txt index e021d87..db086a8 100644 --- a/tests/integration/CMakeLists.txt +++ b/tests/integration/CMakeLists.txt @@ -74,10 +74,18 @@ target_link_libraries( gmenuharness-shared ) -add_test( +execute_process( + COMMAND whoami + OUTPUT_VARIABLE TESTS_USER + STRIP_TRAILING_WHITESPACE +) + +if(NOT "${TESTS_USER}" STREQUAL "jenkins") + add_test( integration-tests integration-tests -) + ) +endif() set( SET-VOLUME-SRC -- cgit v1.2.3 From 305f1ab1bee845c46fc50990602130c3fb565acb Mon Sep 17 00:00:00 2001 From: Rodney Dawes Date: Mon, 27 Mar 2017 16:36:54 -0400 Subject: Fix cmake option. --- tests/integration/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/CMakeLists.txt b/tests/integration/CMakeLists.txt index db086a8..0595584 100644 --- a/tests/integration/CMakeLists.txt +++ b/tests/integration/CMakeLists.txt @@ -77,7 +77,7 @@ target_link_libraries( execute_process( COMMAND whoami OUTPUT_VARIABLE TESTS_USER - STRIP_TRAILING_WHITESPACE + OUTPUT_STRIP_TRAILING_WHITESPACE ) if(NOT "${TESTS_USER}" STREQUAL "jenkins") -- cgit v1.2.3 From 6bfcb0757a60cd9fb75d689c632c1279bbf32d75 Mon Sep 17 00:00:00 2001 From: Rodney Dawes Date: Tue, 28 Mar 2017 10:52:39 -0400 Subject: Add comment explaining pulseaudio startup issue. --- tests/integration/CMakeLists.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/integration/CMakeLists.txt b/tests/integration/CMakeLists.txt index 0595584..0f4a53c 100644 --- a/tests/integration/CMakeLists.txt +++ b/tests/integration/CMakeLists.txt @@ -74,6 +74,13 @@ target_link_libraries( gmenuharness-shared ) +#### +## When building under jenkins, pulseuadio fails to start as there is no +## /run/user tree, HOME directory is missing, and similar issues. So here +## we check that we are the jenkins user, and avoid the integration tests, +## until such time in future when we can run these tests in some different +## manner to avoid needing to run pulseaudio in this way. +#### execute_process( COMMAND whoami OUTPUT_VARIABLE TESTS_USER -- cgit v1.2.3