summaryrefslogtreecommitdiff
path: root/t/conflnk2.sh
diff options
context:
space:
mode:
Diffstat (limited to 't/conflnk2.sh')
-rw-r--r--t/conflnk2.sh33
1 files changed, 20 insertions, 13 deletions
diff --git a/t/conflnk2.sh b/t/conflnk2.sh
index f376573ae..451ab80be 100644
--- a/t/conflnk2.sh
+++ b/t/conflnk2.sh
@@ -19,18 +19,7 @@
. test-init.sh
-cat > Makefile.am << 'END'
-SUBDIRS = sdir
-.PHONY: test
-test: distdir
- test -f $(distdir)/src
- test -f $(distdir)/src2
- test -f $(distdir)/sdir/src3
- test -f $(distdir)/sdir-no-make/src4
- test 2 -gt `find $(distdir)/sdir -type d | wc -l`
- test 2 -gt `find $(distdir)/sdir-no-make -type d | wc -l`
- test 4 -gt `find $(distdir) -type d | wc -l`
-END
+echo SUBDIRS = sdir > Makefile.am
: > src
: > src2
@@ -52,6 +41,24 @@ $ACLOCAL
$AUTOMAKE
$AUTOCONF
./configure
-$MAKE test
+$MAKE distdir
+
+find $distdir # For debugging.
+
+rm -rf $distdir/am-ng
+
+test -f $distdir/src
+test -f $distdir/src2
+test -f $distdir/sdir/src3
+test -f $distdir/sdir-no-make/src4
+
+count_distributed_dirs ()
+{
+ find $distdir${1+"/$1"} -type d | wc -l
+}
+
+test 2 -gt $(count_distributed_dirs 'sdir')
+test 2 -gt $(count_distributed_dirs 'sdir-no-make')
+test 4 -gt $(count_distributed_dirs)
: