From c840cd4334c086f5ce4d9144d9fac75643824a38 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Thu, 16 Aug 2007 16:28:11 +0200 Subject: Parallel "make check" support. * build-aux/check.mk: New file, from The Vaucanson Group. * .x-sc_GPL_version: New file, to allow "version 2 or later" in build-aux/check.mk. * Makefile.am (EXTRA_DIST): Add .x-sc_GPL_version. * tests/check.mk: New file. * tests/Makefile.am (EXTRA_DIST): Add check.mk, mkdtemp and test-lib.sh. Begin factoring "sample-test" out of test scripts. * tests/test-lib.sh: New file, to be sourced by all tests that were previously derived from the "sample-test" template. * tests/mkdtemp: New file. * tests/touch/dir-1: Use test-lib.sh. * tests/touch/empty-file: Likewise. * tests/touch/fail-diag: Likewise. * tests/touch/fifo: Likewise. * tests/touch/no-create-missing: Likewise. * tests/touch/no-rights: Likewise. Also, don't sleep. * tests/touch/not-owner: Likewise. * tests/touch/obsolescent: Likewise. * tests/touch/read-only: Likewise. * tests/touch/relative: Likewise. * tests/touch/Makefile.am: Include $(top_srcdir)/tests/check.mk, to get the parallel-"make check" bits. Move a slow test into tests/misc. * tests/check.mk: Wrapper. * tests/ls/time-1: Move this file to tests/misc/ls-time. * tests/misc/ls-time: New file. From tests/ls/time-1. * tests/ls/Makefile.am (TESTS): Remove time-1. * tests/misc/Makefile.am (TESTS): Add ls-time. --- tests/touch/empty-file | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'tests/touch/empty-file') diff --git a/tests/touch/empty-file b/tests/touch/empty-file index 6ab07e388..013d93f99 100755 --- a/tests/touch/empty-file +++ b/tests/touch/empty-file @@ -1,7 +1,7 @@ #!/bin/sh # Make sure touch can set the mtime on an empty file. -# Copyright (C) 1998, 1999, 2000, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 1998, 1999, 2000, 2005-2007 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,7 +26,7 @@ if test "$VERBOSE" = yes; then touch --version fi -. $srcdir/../envvar-check +. $srcdir/../test-lib.sh DEFAULT_SLEEP_SECONDS=2 SLEEP_SECONDS=${SLEEP_SECONDS=$DEFAULT_SLEEP_SECONDS} @@ -50,11 +50,6 @@ for d in $TOUCH_DIR_LIST; do test -f $d/c || framework_failure=1 done -if test $framework_failure = 1; then - echo 'failure in testing framework' - exit 1 -fi - echo sleeping for $SLEEP_SECONDS seconds... sleep $SLEEP_SECONDS for d in $TOUCH_DIR_LIST; do -- cgit v1.2.3-70-g09d2