From: Arvin Schnell <aschnell@suse.de>
Date: Thu, 23 Oct 2014 09:48:22 +0000 (+0200)
Subject: - use automake testsuite features
X-Git-Tag: v0.2.5~6^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b3f14d1facd65baa1a6a2faf5458cba75fd68a42;p=thirdparty%2Fsnapper.git

- use automake testsuite features
---

diff --git a/.gitignore b/.gitignore
index 91408fe6..28ab8800 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ ltmain.sh
 missing
 stamp-h1
 py-compile
+test-driver
diff --git a/testsuite/.gitignore b/testsuite/.gitignore
index 82532a6a..39d94e9f 100644
--- a/testsuite/.gitignore
+++ b/testsuite/.gitignore
@@ -1,4 +1,7 @@
+*.log
 *.o
-dirname1
+*.trs
 basename1
+dirname1
 sysconfig-get1
+test-suite.log
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index af160052..acacf399 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -8,17 +8,13 @@ INCLUDES = -I$(top_srcdir)
 
 LDADD = ../snapper/libsnapper.la
 
-noinst_SCRIPTS = run-all
+check_PROGRAMS = sysconfig-get1 dirname1 basename1
 
-noinst_PROGRAMS = sysconfig-get1 dirname1 basename1
+TESTS = $(check_PROGRAMS)
 
-sysconfig_get1_SOURCES = sysconfig-get1.cc common.h
-
-dirname1_SOURCES = dirname1.cc common.h
 basename1_SOURCES = basename1.cc common.h
+dirname1_SOURCES = dirname1.cc common.h
+sysconfig_get1_SOURCES = sysconfig-get1.cc common.h
 
 EXTRA_DIST = $(noinst_SCRIPTS) sysconfig-get1.txt
 
-check:
-	./run-all
-
diff --git a/testsuite/run-all b/testsuite/run-all
deleted file mode 100755
index 1726df76..00000000
--- a/testsuite/run-all
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-
-function run()
-{
-    cmd=$1
-
-    echo
-    echo "*** running $cmd ***"
-    echo
-
-    ./$cmd
-
-    if [ $? != 0 ] ; then
-        echo "failed"
-        exit 1
-    fi
-}
-
-
-run dirname1
-run basename1
-
-run sysconfig-get1
-