1 files changed, 17 insertions, 40 deletions
diff --git a/t/repeated-options.sh b/t/repeated-options.sh
index 1347b471e..4a9e5b255 100644
--- a/t/repeated-options.sh
+++ b/t/repeated-options.sh
@@ -17,65 +17,42 @@
 # Check that automake does not complain on repeated options, nor
 # generate broken or incorrect makefiles.
 
-required='cc bzip2'
 . test-init.sh
 
 cat >configure.ac <<END
 AC_INIT([$me], [1.0])
-AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip no-dist-gzip dist-bzip2])
-AC_PROG_CC
+AM_INIT_AUTOMAKE([foreign foreign no-installman serial-tests \
+                  no-installman])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
 END
 
 cat > Makefile.am <<'END'
-AUTOMAKE_OPTIONS = parallel-tests subdir-objects subdir-objects
-AUTOMAKE_OPTIONS += dist-bzip2 parallel-tests
-TESTS = foo.test
-EXTRA_DIST = $(TESTS)
-TESTS_ENVIRONMENT = EXEEXT='$(EXEEXT)'
-bin_PROGRAMS = sub/foo
-.PHONY: test-build
-test-build:
-	ls -l . sub
-	test -f sub/foo.$(OBJEXT)
-	test -f sub/foo$(EXEEXT)
+AUTOMAKE_OPTIONS =  no-installman no-installman serial-tests
+AUTOMAKE_OPTIONS += serial-tests foreign
+TESTS = foo
+EXTRA_DIST = foo
+CLEANFILES = bar.out
 END
 
-mkdir sub
-
-cat > foo.test <<'END'
+cat > foo <<'END'
 #!/bin/sh
-test -f sub/foo$EXEEXT && test -x sub/foo$EXEEXT
-END
-chmod a+x foo.test
-
-cat > sub/foo.c <<'END'
-int main (void)
-{
-  return 0;
-}
+echo RUN RUN
+: > bar.out
 END
-
-cp "$am_scriptdir"/test-driver .
+chmod a+x foo
 
 $ACLOCAL
-$AUTOMAKE --foreign --foreign -Wall 2>stderr || { cat stderr >&2; exit 1; }
-test -s stderr && { cat stderr >&2; exit 1; }
-rm -f stderr
 $AUTOCONF
+$AUTOMAKE --foreign --foreign -Wall 2>stderr && test ! -s stderr \
+  || { cat stderr >&2; exit 1; }
 
 ./configure
-$MAKE
-$MAKE test-build
+
 $MAKE check
-ls -l
-test -f foo.log
-test -f test-suite.log
-$MAKE clean
+test -f bar.out
+test ! -e foo.log
+test ! -e test-suite.log
 $MAKE distcheck
-ls -l
-test -f $me-1.0.tar.bz2
-test ! -e $me-1.0.tar.gz
 
 :