koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

testsuite: use relative paths, set PATH to absolute path

Browse Source 
This approach works better with autotools, which supports the build
directory being complete outside the source tree.
This commit is contained in:
Michael Stapelberg
2016-10-10 21:14:59 +02:00
parent 4a52a7e9fb
commit 84e70a19a8
10 changed files with 41 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
testcases/lib/SocketActivation.pm
View File

@ -62,14 +62,6 @@ sub activate_i3 {
mkdir $ENV{XDG_RUNTIME_DIR};
}
$ENV{DISPLAY} = $args{display};
$ENV{PATH} = join(':',
'../i3-nagbar',
'../i3-msg',
'../i3-config-wizard',
'../i3bar',
'..',
$ENV{PATH}
);
# We are about to exec, but we did not modify $^F to include $socket
# when creating the socket (because the file descriptor could have a
@ -96,7 +88,7 @@ sub activate_i3 {
# the interactive signalhandler to make it crash immediately instead.
# Also disable logging to SHM since we redirect the logs anyways.
# Force Xinerama because we use Xdmx for multi-monitor tests.
my $i3cmd = abs_path("../i3") . q| --shmlog-size=0 --disable-signalhandler --force-xinerama|;
my $i3cmd = q|i3 --shmlog-size=0 --disable-signalhandler --force-xinerama|;
if (!$args{validate_config}) {
# We only set logging if i3 is actually started, but not if we only
# validate the config file. This is to keep logging to a minimum as