From 5d325e60db5e764422ed22a48a15931134eeb7c7 Mon Sep 17 00:00:00 2001
From: Hans Ulrich Niedermann <hun@n-dimensional.de>
Date: Thu, 3 Jul 2008 23:37:06 +0200
Subject: Use wrapper type macro for automake tests

---
 test/local.at        | 19 +++++++------------
 test/nbb-automake.at | 32 ++++++++++++++++----------------
 2 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/test/local.at b/test/local.at
index 7bfb734..0226c15 100644
--- a/test/local.at
+++ b/test/local.at
@@ -71,13 +71,10 @@ $1
 ])dnl
 
 
-dnl AT_CREATE_GIT_AM()dnl
-m4_define([AT_CREATE_GIT_AM], [dnl
-AT_CHECK([mkdir test.git && cd test.git])
-AT_CHECK([cd test.git && git init], [0],
-[Initialized empty Git repository in .git/
-])
-AT_DATA([test.git/configure.ac], [dnl
+dnl AT_WRAP_GIT_AM([stuff-to-do-with-tree])dnl
+m4_define([AT_WRAP_GIT_AM], [dnl
+AT_WRAP_GIT([
+AT_DATA([test.dir/configure.ac], [dnl
 AC[_]INIT(nbb git/automake test, 1.2.3, invalid@invalid.invalid, nbb-git-am-test)
 AC_CONFIG_SRCDIR([foobar.c])
 AM[_]INIT_AUTOMAKE([-Wall foreign])
@@ -86,20 +83,18 @@ AC_PROG_INSTALL
 AC[_]CONFIG_FILES(@<:@Makefile@:>@)
 AC[_]OUTPUT
 ])dnl
-AT_DATA([test.git/Makefile.am], [dnl
+AT_DATA([test.dir/Makefile.am], [dnl
 TESTS = foobar
 bin_PROGRAMS = foobar
 foobar_SOURCES = foobar.c
 ])dnl
-AT_DATA([test.git/foobar.c], [dnl
+AT_DATA([test.dir/foobar.c], [dnl
 #include <stdio.h>
 int main(int argc, char *argv@<:@@:>@) {
     printf("FOOBAR!\n");
     return 0;
 }
 ])dnl
+$1
 ])dnl
-
-m4_define([AT_REMOVE_GIT_AM], [dnl
-AT_CHECK([rm -rf test.git])
 ])dnl
diff --git a/test/nbb-automake.at b/test/nbb-automake.at
index dff6dda..bf9218d 100644
--- a/test/nbb-automake.at
+++ b/test/nbb-automake.at
@@ -8,46 +8,46 @@ dnl ===================================================================
 
 AT_SETUP([nbb automake: init])
 AT_KEYWORDS([nbb automake init])
-AT_CREATE_GIT_AM()
-AT_CHECK([cd test.git && AT_NBB init], [0], [ignore], [ignore])
-AT_REMOVE_GIT_AM()
+AT_WRAP_GIT_AM([dnl
+AT_CHECK([cd test.dir && AT_NBB init], [0], [ignore], [ignore])
+])
 AT_CLEANUP()
 
 dnl ===================================================================
 
 AT_SETUP([nbb automake: configure])
 AT_KEYWORDS([nbb automake configure])
-AT_CREATE_GIT_AM()
-AT_CHECK([cd test.git && AT_NBB configure], [0], [ignore], [ignore])
-AT_REMOVE_GIT_AM()
+AT_WRAP_GIT_AM([dnl
+AT_CHECK([cd test.dir && AT_NBB configure], [0], [ignore], [ignore])
+])
 AT_CLEANUP()
 
 dnl ===================================================================
 
 AT_SETUP([nbb automake: build])
 AT_KEYWORDS([nbb automake build])
-AT_CREATE_GIT_AM()
-AT_CHECK([cd test.git && AT_NBB build], [0], [ignore], [ignore])
-AT_REMOVE_GIT_AM()
+AT_WRAP_GIT_AM([dnl
+AT_CHECK([cd test.dir && AT_NBB build], [0], [ignore], [ignore])
+])
 AT_CLEANUP()
 
 dnl ===================================================================
 
 AT_SETUP([nbb automake: install])
 AT_KEYWORDS([nbb automake install])
-AT_CREATE_GIT_AM()
-AT_CHECK([cd test.git && AT_NBB install], [0], [ignore], [ignore])
-AT_REMOVE_GIT_AM()
+AT_WRAP_GIT_AM([dnl
+AT_CHECK([cd test.dir && AT_NBB install], [0], [ignore], [ignore])
+])
 AT_CLEANUP()
 
 dnl ===================================================================
 
 AT_SETUP([nbb automake: make distcheck])
 AT_KEYWORDS([nbb automake make distcheck])
-AT_CREATE_GIT_AM()
-AT_CHECK([cd test.git && AT_NBB configure], [0], [ignore], [ignore])
-AT_CHECK([cd test.git && AT_NBB make distcheck], [0], [ignore], [ignore])
-AT_REMOVE_GIT_AM()
+AT_WRAP_GIT_AM([dl
+AT_CHECK([cd test.dir && AT_NBB configure], [0], [ignore], [ignore])
+AT_CHECK([cd test.dir && AT_NBB make distcheck], [0], [ignore], [ignore])
+])
 AT_CLEANUP()
 
 dnl ===================================================================
-- 
cgit