From a3ce2b9778ca5cbebc13574e685362dda111be64 Mon Sep 17 00:00:00 2001
From: Markus Kauppila <markus.kauppila@gmail.com>
Date: Sat, 6 Aug 2011 19:17:05 +0300
Subject: [PATCH] Fixed 'make distclean'

---
 test/test-automation/Makefile.am                |  9 +++++----
 test/test-automation/build-scripts/distclean.sh | 17 +++++++++++++++++
 .../build-scripts/install-runner.sh             |  2 --
 .../build-scripts/install-tests.sh              |  3 ---
 test/test-automation/src/runner/runner.c        |  2 +-
 5 files changed, 23 insertions(+), 10 deletions(-)
 create mode 100755 test/test-automation/build-scripts/distclean.sh

diff --git a/test/test-automation/Makefile.am b/test/test-automation/Makefile.am
index 74aa0a3ca..b8e04ebe1 100644
--- a/test/test-automation/Makefile.am
+++ b/test/test-automation/Makefile.am
@@ -1,6 +1,7 @@
 ACLOCAL_AMFLAGS = -I acinclude -I build-scripts
 
-SUBDIRS = src/libtest src/runner \
+SUBDIRS = src/libtest \
+		  src/runner \
 		  tests/testdummy \
 		  tests/testrect \
 		  tests/testplatform \
@@ -16,6 +17,6 @@ install-runner:
 install-tests:
 	$(SHELL) build-scripts/install-tests.sh
 
-clean:
-clean-local:
-	echo "clean-local is obsolete"
+distclean-local:
+	$(SHELL) build-scripts/distclean.sh
+
diff --git a/test/test-automation/build-scripts/distclean.sh b/test/test-automation/build-scripts/distclean.sh
new file mode 100755
index 000000000..fa47ceefd
--- /dev/null
+++ b/test/test-automation/build-scripts/distclean.sh
@@ -0,0 +1,17 @@
+#! /bin/bash
+
+DIRECTORY="tests"
+EXT="error"
+
+PLATFORM="$(uname)"
+if [[ $PLATFORM ==  "Linux" ]]; then
+	EXT="so"
+elif [[ $PLATFORM ==  "Darwin" ]]; then
+	EXT="dylib"
+fi
+
+echo "Debug: $DIRECTORY/*.$EXT"
+
+rm -f $DIRECTORY/*.$EXT
+rm -f runner
+rm -f *.bmp
diff --git a/test/test-automation/build-scripts/install-runner.sh b/test/test-automation/build-scripts/install-runner.sh
index 575f888e4..c4f42f785 100755
--- a/test/test-automation/build-scripts/install-runner.sh
+++ b/test/test-automation/build-scripts/install-runner.sh
@@ -1,7 +1,5 @@
 #! /bin/bash
 
-#echo "Installing test suites to $DIRECTORY" 
-
 cp src/runner/.libs/runner .
 chmod u+x runner
 
diff --git a/test/test-automation/build-scripts/install-tests.sh b/test/test-automation/build-scripts/install-tests.sh
index 76478ac97..60fe5ebc3 100755
--- a/test/test-automation/build-scripts/install-tests.sh
+++ b/test/test-automation/build-scripts/install-tests.sh
@@ -5,7 +5,6 @@ EXT="error"
 
 #echo "Installing test suites to $DIRECTORY" 
 
-#rm -Rfv $DIRECTORY/ > /dev/null 2>&1
 mkdir $DIRECTORY > /dev/null 2>&1
 
 PLATFORM="$(uname)"
@@ -21,6 +20,4 @@ do
 	cp -f "$DIRECTORY/$suite/.libs/lib$suite.$EXT" $DIRECTORY
 done
 
-#sudo cp .libs/libtest.0.dylib /usr/local/lib/libtest.0.dylib
-
 echo "Test suites installed."
diff --git a/test/test-automation/src/runner/runner.c b/test/test-automation/src/runner/runner.c
index 3c1bc2786..b3bc468ce 100644
--- a/test/test-automation/src/runner/runner.c
+++ b/test/test-automation/src/runner/runner.c
@@ -233,7 +233,7 @@ ScanForTestSuites(char *directoryName, char *extension)
 	}
 
 	while(entry = readdir(directory)) {
-		 // discards . and .. and hidden files starting with .
+		 // discards . and .. and hidden files starting with dot and directories etc.
 		if(strlen(entry->d_name) > 2 && entry->d_name[0] != '.' && entry->d_type == DT_REG) {
 			const char *delimiters = ".";
 			char *name = strtok(entry->d_name, delimiters);