From ccae52af67b490ffa72fccfe82aecad98333681f Mon Sep 17 00:00:00 2001 From: David Faure Date: Mon, 31 Jul 2017 10:50:16 +0200 Subject: [PATCH] Remove last mentions of sample-kde-env-user.sh, to repair make install --- CMakeLists.txt | 1 - kdesrc-build-test.pl | 5 ----- 2 files changed, 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5bebbff..64d31ef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -90,7 +90,6 @@ install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/kdesrc-build-setup DESTINATION ${BI install(PROGRAMS ${CMAKE_SOURCE_DIR}/sample-kde-env-master.sh - ${CMAKE_SOURCE_DIR}/sample-kde-env-user.sh ${CMAKE_SOURCE_DIR}/sample-xsession.sh DESTINATION ${DATA_INSTALL_DIR}/kdesrc-build) diff --git a/kdesrc-build-test.pl b/kdesrc-build-test.pl index 6eec17c..e6d2422 100755 --- a/kdesrc-build-test.pl +++ b/kdesrc-build-test.pl @@ -570,11 +570,6 @@ do { is(system('/bin/sh', '-u', "$RealBin/sample-kde-env-master.sh"), 0, 'env-master unset variable check'); - # Deliberately after env-master, env-master should have no unset variables if user doesn't set - # this up. - ok(File::Copy::copy("$RealBin/sample-kde-env-user.sh", "$testSourceDirName/kde-env-user.sh"), - 'env-user sample installation'); - # Ensure this function can run without throwing exception. ok(installTemplatedFile("$RealBin/sample-kde-env-master.sh", "$testSourceDirName/kde-env-master.sh", $ctx) || 1, 'env-master template installation');