[debian-edu-commits] debian-edu/ 03/04: Rename testsuite/xfree86 -> testsuite/xorg and adjust code to match Xorg.

[Wolfgang Schweer]

This is an automated email from the git hooks/post-receive script.

schweer-guest pushed a commit to branch master
in repository debian-edu-config.

commit 1d25aaf80532941916b9745d2e0cf59b1e33876e
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Tue Nov 1 20:44:26 2016 +0100

    Rename testsuite/xfree86 -> testsuite/xorg and adjust code to match Xorg.
---
 testsuite/xfree86 | 42 ------------------------------------------
 testsuite/xorg    | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 42 deletions(-)

diff --git a/testsuite/xfree86 b/testsuite/xfree86
deleted file mode 100755
index 98c1aa3..0000000
--- a/testsuite/xfree86
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh -e
-#
-# Test if the XFree86 server is working.
-
-. /usr/share/debian-edu-config/testsuite-lib.sh
-
-if test -r /etc/debian-edu/config ; then
-    . /etc/debian-edu/config
-fi
-
-# Standalone Main-Server do not install XFree86 dictionaries
-if [ "$PROFILE" = Main-Server ] ; then
-    exit 0
-fi
-
-# Only test if xserver-common is installed
-if  deb_installed xserver-common ; then
-    :
-else
-    echo "info: $0: xserver-common is not installed"
-    exit 0
-fi
-
-symlink=/etc/X11/X
-if [ -e $symlink ] ; then
-	linkto=`ls -l $symlink | rev | awk '{ print $1 }' | rev`
-	echo "info: $0: Symlink $symlink points to $linkto"
-else
-	echo "error: $0: no symlink $symlink pointing to X server"
-fi
-
-#filename=/tmp/.X11-unix/X0
-#if netstat -a 2>&1 | grep LISTENING | grep -q "$filename" ; then
-#    echo "success: $0: XFree86 server is listening on $filename."
-#else
-#    # X is not started yet when this is executed during installation.
-#    # Thus only information.
-#    echo "info: $0: XFree86 server is not listening on $filename."
-#    exit 1
-#fi
-
-exit 0
diff --git a/testsuite/xorg b/testsuite/xorg
new file mode 100755
index 0000000..d2538ac
--- /dev/null
+++ b/testsuite/xorg
@@ -0,0 +1,32 @@
+#!/bin/sh -e
+#
+# Test if the Xorg server is working.
+
+. /usr/share/debian-edu-config/testsuite-lib.sh
+
+if test -r /etc/debian-edu/config ; then
+    . /etc/debian-edu/config
+fi
+
+# On a standalone main server Xorg is not installed.
+if [ "$PROFILE" = Main-Server ] ; then
+    exit 0
+fi
+
+# Only test if xserver-common is installed
+if  deb_installed xserver-common ; then
+    :
+else
+    echo "info: $0: xserver-common is not installed"
+    exit 0
+fi
+
+symlink=/usr/bin/X
+if [ -e $symlink ] ; then
+	linkto=`ls -l $symlink | rev | awk '{ print $1 }' | rev`
+	echo "info: $0: Symlink $symlink points to $linkto"
+else
+	echo "error: $0: no symlink $symlink pointing to Xorg server"
+fi
+
+exit 0

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git