[SCM] muon packaging branch, gsoc-floris-2014, updated. b35491b3bac7623ceefc90b2945dee4b6bb8f388

[Floris-Andrei Stoica-Marcu]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/muon.git;a=commitdiff;h=b35491b

The following commit has been merged in the gsoc-floris-2014 branch:
commit b35491b3bac7623ceefc90b2945dee4b6bb8f388
Author: Floris-Andrei Stoica-Marcu <floris.sm at gmail.com>
Date:   Sun Aug 24 23:19:06 2014 +0300

    Proper script for running tests, made by maxy (Maximiliano Curia).
---
 debian/rules         |  2 +-
 debian/testScript.sh | 29 -----------------------------
 debian/xsession.sh   |  7 +++++++
 3 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/debian/rules b/debian/rules
index d317eb4..daf7d1c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,6 @@ override_dh_install:
 	dh_install --fail-missing
 
 override_dh_auto_test:
-	./debian/testScript.sh && exit $?
+	./debian/xsession.sh
 
 .PHONY: override_dh_install
diff --git a/debian/testScript.sh b/debian/testScript.sh
deleted file mode 100755
index 42ff64c..0000000
--- a/debian/testScript.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-cd ./obj*
-
-output=$(ctest -V -N)
-i=0
-n=0
-
-printf %s "$output" | while IFS= read -r line
-do
-   for word in $line
-    do 
-      if [[ $word == *.shell* ]] 
-	then
-	  $(xvfb-run $word --quiet)
-	  sleep 5
-	  n=$((n + 1))
-	  echo "Running Test $line"
-	  if [[ $? == 0 ]]
-	    then
-	      echo "Passed Test!"
-	      i=$((i + 1))
-	    else
-	      echo "Test failed"
-	      exit $?
-	  fi
-      fi
-   done
-done
\ No newline at end of file
diff --git a/debian/xsession.sh b/debian/xsession.sh
new file mode 100755
index 0000000..5906566
--- /dev/null
+++ b/debian/xsession.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+kdeinit4
+dh_auto_test
+ret=$?
+kdeinit4_shutdown
+exit $ret

-- 
muon packaging