test-runner.c: Fix: Make the test configuration files aware of the --with-greeter-user configuration parameter

Use GREETER_USER for the greeter user name in the
`tests/scripts/*-pam*.conf.in` files. Without this modification
LightDM built with non-default greeter user name is unable to pass
some tests.

Signed-off-by: Paul Wolneykien <manowar@altlinux.org>

4 files changed, 21 insertions, 18 deletions

diff --git a/configure.ac b/configure.ac
index b386ab63..7e2b4eeb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -216,6 +216,9 @@ po/Makefile.in
 src/Makefile
 tests/Makefile
 tests/src/Makefile
+tests/scripts/login-pam-config.conf
+tests/scripts/login-pam.conf
+tests/scripts/switch-to-greeter-return-session-pam.conf
 ])
 AC_OUTPUT
 
diff --git a/tests/scripts/login-pam-config.conf b/tests/scripts/login-pam-config.conf.in
index 48199767..fc85031c 100644
--- a/tests/scripts/login-pam-config.conf
+++ b/tests/scripts/login-pam-config.conf.in
@@ -22,9 +22,9 @@ log-events=true
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Create PAM session for greeter
-#?PAM-lightdm START SERVICE=lightdm-greeter-alternative USER=lightdm
-#?PAM-lightdm SETCRED ESTABLISH_CRED
-#?PAM-lightdm OPEN-SESSION
+#?PAM-@GREETER_USER@ START SERVICE=lightdm-greeter-alternative USER=@GREETER_USER@
+#?PAM-@GREETER_USER@ SETCRED ESTABLISH_CRED
+#?PAM-@GREETER_USER@ OPEN-SESSION
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
@@ -50,9 +50,9 @@ log-events=true
 
 # Greeter session stops
 #?GREETER-X-0 TERMINATE SIGNAL=15
-#?PAM-lightdm CLOSE-SESSION
-#?PAM-lightdm SETCRED DELETE_CRED
-#?PAM-lightdm END
+#?PAM-@GREETER_USER@ CLOSE-SESSION
+#?PAM-@GREETER_USER@ SETCRED DELETE_CRED
+#?PAM-@GREETER_USER@ END
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
diff --git a/tests/scripts/login-pam.conf b/tests/scripts/login-pam.conf.in
index c9d51f55..36840790 100644
--- a/tests/scripts/login-pam.conf
+++ b/tests/scripts/login-pam.conf.in
@@ -20,9 +20,9 @@ log-events=true
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Create PAM session for greeter
-#?PAM-lightdm START SERVICE=lightdm-greeter USER=lightdm
-#?PAM-lightdm SETCRED ESTABLISH_CRED
-#?PAM-lightdm OPEN-SESSION
+#?PAM-@GREETER_USER@ START SERVICE=lightdm-greeter USER=@GREETER_USER@
+#?PAM-@GREETER_USER@ SETCRED ESTABLISH_CRED
+#?PAM-@GREETER_USER@ OPEN-SESSION
 
 # Greeter starts
 #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
@@ -48,9 +48,9 @@ log-events=true
 
 # Greeter session stops
 #?GREETER-X-0 TERMINATE SIGNAL=15
-#?PAM-lightdm CLOSE-SESSION
-#?PAM-lightdm SETCRED DELETE_CRED
-#?PAM-lightdm END
+#?PAM-@GREETER_USER@ CLOSE-SESSION
+#?PAM-@GREETER_USER@ SETCRED DELETE_CRED
+#?PAM-@GREETER_USER@ END
 
 # Session starts
 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
diff --git a/tests/scripts/switch-to-greeter-return-session-pam.conf b/tests/scripts/switch-to-greeter-return-session-pam.conf.in
index 7e79e57f..79de4344 100644
--- a/tests/scripts/switch-to-greeter-return-session-pam.conf
+++ b/tests/scripts/switch-to-greeter-return-session-pam.conf.in
@@ -49,9 +49,9 @@ log-events=true
 #?LOGIN1 LOCK-SESSION SESSION=c0
 
 # Create PAM session for greeter
-#?PAM-lightdm START SERVICE=lightdm-greeter USER=lightdm
-#?PAM-lightdm SETCRED ESTABLISH_CRED
-#?PAM-lightdm OPEN-SESSION
+#?PAM-@GREETER_USER@ START SERVICE=lightdm-greeter USER=@GREETER_USER@
+#?PAM-@GREETER_USER@ SETCRED ESTABLISH_CRED
+#?PAM-@GREETER_USER@ OPEN-SESSION
 
 # Greeter starts
 #?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_CLASS=greeter
@@ -87,9 +87,9 @@ log-events=true
 
 # Greeter and X server stop
 #?GREETER-X-1 TERMINATE SIGNAL=15
-#?PAM-lightdm CLOSE-SESSION
-#?PAM-lightdm SETCRED DELETE_CRED
-#?PAM-lightdm END
+#?PAM-@GREETER_USER@ CLOSE-SESSION
+#?PAM-@GREETER_USER@ SETCRED DELETE_CRED
+#?PAM-@GREETER_USER@ END
 #?XSERVER-1 TERMINATE SIGNAL=15
 
 # Cleanup