- use automake testsuite features

diff --git a/.gitignore b/.gitignore
index 91408fe6b5771d97f794f51829cb8c032977d93d..28ab8800f62fa3ecbfc074240bbebb298abbea11 100644 (file)
--- 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 82532a6a22ac7502948f14fd500a5c9829680aa7..39d94e9f803951c022b578d44a2c096173f434ad 100644 (file)
--- 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 af160052e8694cea72c4f6f5499b6cec9c855eed..acacf399d2c9b50f5907a6904583f18697123d25 100644 (file)
--- 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 (executable)
index 1726df7..0000000
--- 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
-