nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into next

next
Michael Stapelberg 2013-01-25 13:56:26 +01:00
parent fc3b0db7a5 8f4456a14a
commit c2061042e1
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
parser-specs/config.spec
View File

@ -214,7 +214,7 @@ state WORKSPACE_OUTPUT:
-> WORKSPACE_OUTPUT_STR
state WORKSPACE_OUTPUT_STR:
output = string
output = word
-> call cfg_workspace($workspace, $output)
# ipc-socket <path>

18
testcases/t/201-config-parser.t
View File

@ -204,6 +204,24 @@ is(parser_calls($config),
$expected,
'workspace_layout ok');
################################################################################
# workspace assignments, with trailing whitespace (ticket #921)
################################################################################
$config = <<'EOT';
workspace "3" output DP-1
workspace "3" output VGA-1
EOT
$expected = <<'EOT';
cfg_workspace(3, DP-1)
cfg_workspace(3, VGA-1)
EOT
is(parser_calls($config),
$expected,
'workspace assignment ok');
################################################################################
# new_window
################################################################################