From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=3.0 tests=AWL,BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE, SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id EFABC1F5AE for ; Fri, 3 Jul 2020 17:18:06 +0000 (UTC) Received: from localhost ([::1]:57750 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jrPKA-0002DD-5T for normalperson@yhbt.net; Fri, 03 Jul 2020 13:18:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50504) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jrOxc-0005ob-Lx for bug-gnulib@gnu.org; Fri, 03 Jul 2020 12:54:49 -0400 Received: from mo4-p00-ob.smtp.rzone.de ([85.215.255.21]:15689) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jrOxZ-0005od-VI for bug-gnulib@gnu.org; Fri, 03 Jul 2020 12:54:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1593795283; s=strato-dkim-0002; d=clisp.org; h=Message-ID:Date:Subject:To:From:X-RZG-CLASS-ID:X-RZG-AUTH:From: Subject:Sender; bh=d2Pc7ogF3kwXsMJy6O6JU7MSKOJLYEhANWUxbf6OBoc=; b=Krgu5TUO2JMAXVjRs+NjDgRrMaPoeVXR7V76UfuQSXBiDkYJTXNLR1TidaCKN7/34z D4ZxkUpKIScVE1SUYYS+HJINygQJqCpM/MsBrPdlWsUTivlnGwpFd4XAaeH8sy84n7Wj 5DwIeZdPRSUaIqQN+uxqgjBmOzd1O3bAj2KCgpw8cnbrnVM6ZgpU4pHA9DMufQT1kXrq xrMZa8/WZ4qK7UY8bRaHOQ0uLHlurFvZYtjOwRYfu0Uj7uJS2munnzPJRZ2y3o1+d7dh bwS8vE00fWcaph5lwg/HZDJz3Hv0yZVqevsBG7dEWMeGX3PjtLyqpWp7Kat2l213yf6Y A+/Q== X-RZG-AUTH: ":Ln4Re0+Ic/6oZXR1YgKryK8brlshOcZlIWs+iCP5vnk6shH+AHjwLuWOH6fzxfs=" X-RZG-CLASS-ID: mo00 Received: from bruno.haible.de by smtp.strato.de (RZmta 46.10.5 DYNA|AUTH) with ESMTPSA id R03d1aw63Gsg0dx (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (curve X9_62_prime256v1 with 256 ECDH bits, eq. 3072 bits RSA)) (Client did not present a certificate); Fri, 3 Jul 2020 18:54:42 +0200 (CEST) From: Bruno Haible To: bug-gnulib@gnu.org Subject: dfa tests: follow common file naming conventions Date: Fri, 03 Jul 2020 18:54:41 +0200 Message-ID: <2286922.F0gb5rNVDJ@omega> User-Agent: KMail/5.1.3 (Linux/4.4.0-179-generic; KDE/5.18.0; x86_64; ; ) MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Received-SPF: none client-ip=85.215.255.21; envelope-from=bruno@clisp.org; helo=mo4-p00-ob.smtp.rzone.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/03 12:54:43 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_PASS=-0.001, SPF_NONE=0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Gnulib discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnulib-bounces+normalperson=yhbt.net@gnu.org Sender: "bug-gnulib" For many years now, we have this (unwritten) convention regarding names of files in tests/: - Files that start with "test-" are test files for a specific module. - Other files are shared (or can be shared) among multiple modules. Only the 'dfa' tests don't follow this convention. 2020-07-03 Bruno Haible dfa tests: Follow common file naming conventions. * tests/test-dfa-match-aux.c: Renamed from tests/dfa-match-aux.c. * tests/test-dfa-match.sh: Renamed from tests/dfa-match.sh. Update. * tests/test-dfa-invalid-char-class.sh: Renamed from tests/dfa-invalid-char-class.sh. Update. * modules/dfa-tests (Files, Makefile.am): Update. diff --git a/modules/dfa-tests b/modules/dfa-tests index 5855652..4c447c2 100644 --- a/modules/dfa-tests +++ b/modules/dfa-tests @@ -1,7 +1,7 @@ Files: -tests/dfa-match.sh -tests/dfa-match-aux.c -tests/dfa-invalid-char-class.sh +tests/test-dfa-match.sh +tests/test-dfa-match-aux.c +tests/test-dfa-invalid-char-class.sh Depends-on: getprogname @@ -13,9 +13,9 @@ regex configure.ac: Makefile.am: -TESTS += \ - dfa-invalid-char-class.sh \ - dfa-match.sh +TESTS += \ + test-dfa-invalid-char-class.sh \ + test-dfa-match.sh -check_PROGRAMS += dfa-match-aux -dfa_match_aux_LDADD = $(LDADD) $(LIB_SETLOCALE) @LIBINTL@ $(LIB_MBRTOWC) +check_PROGRAMS += test-dfa-match-aux +test_dfa_match_aux_LDADD = $(LDADD) $(LIB_SETLOCALE) @LIBINTL@ $(LIB_MBRTOWC) diff --git a/tests/dfa-invalid-char-class.sh b/tests/test-dfa-invalid-char-class.sh similarity index 88% rename from tests/dfa-invalid-char-class.sh rename to tests/test-dfa-invalid-char-class.sh index 8e8824d..094bab0 100755 --- a/tests/dfa-invalid-char-class.sh +++ b/tests/test-dfa-invalid-char-class.sh @@ -18,13 +18,13 @@ . "${srcdir=.}/init.sh"; path_prepend_ ../src -# Add "." to PATH for the use of dfa-match-aux. +# Add "." to PATH for the use of test-dfa-match-aux. path_prepend_ . fail=0 echo 'dfaerror: invalid character class' > exp -LC_ALL=C ${CHECKER} dfa-match-aux '[[:foo:]]' a > out 2>&1 +LC_ALL=C ${CHECKER} test-dfa-match-aux '[[:foo:]]' a > out 2>&1 compare exp out || fail=1 Exit $fail diff --git a/tests/dfa-match-aux.c b/tests/test-dfa-match-aux.c similarity index 100% rename from tests/dfa-match-aux.c rename to tests/test-dfa-match-aux.c diff --git a/tests/dfa-match.sh b/tests/test-dfa-match.sh similarity index 86% rename from tests/dfa-match.sh rename to tests/test-dfa-match.sh index bc9e1dc..a7285ec 100755 --- a/tests/dfa-match.sh +++ b/tests/test-dfa-match.sh @@ -18,7 +18,7 @@ . "${srcdir=.}/init.sh"; path_prepend_ ../src -# Add "." to PATH for the use of dfa-match-aux. +# Add "." to PATH for the use of test-dfa-match-aux. path_prepend_ . if (type timeout) >/dev/null 2>&1; then @@ -33,11 +33,11 @@ fi fail=0 -${CHECKER} dfa-match-aux a ba 0 > out || fail=1 +${CHECKER} test-dfa-match-aux a ba 0 > out || fail=1 compare /dev/null out || fail=1 in=$(printf "bb\nbb") -$timeout_10 ${CHECKER} dfa-match-aux a "$in" 1 > out || fail=1 +$timeout_10 ${CHECKER} test-dfa-match-aux a "$in" 1 > out || fail=1 compare /dev/null out || fail=1 Exit $fail