diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | tests/data/perl.conf | 3 | ||||
| -rwxr-xr-x | tests/docs/spdx-license-t | 10 |
4 files changed, 14 insertions, 8 deletions
@@ -10,6 +10,7 @@ /config.log /config.status /configure +/configure~ /perl/Build /perl/MYMETA.json /perl/MYMETA.yml diff --git a/configure.ac b/configure.ac index 80eeee1..b8f84f5 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl Autoconf configuration for wallet. dnl dnl Written by Russ Allbery <eagle@eyrie.org> -dnl Copyright 2014, 2016, 2018, 2020 Russ Allbery <eagle@eyrie.org> +dnl Copyright 2014, 2016, 2018, 2020-2021 Russ Allbery <eagle@eyrie.org> dnl Copyright 2006-2008, 2010, 2013-2014 dnl The Board of Trustees of the Leland Stanford Junior University dnl @@ -39,12 +39,12 @@ AC_PROG_MKDIR_P dnl Allow modification of the default wallet port, and setting a default dnl wallet server when none is defined in krb5.conf. AC_ARG_WITH([wallet-server], - [AC_HELP_STRING([--with-wallet-server=HOST], [Default wallet server])], + [AS_HELP_STRING([--with-wallet-server=HOST], [Default wallet server])], [AS_IF([test x"$withval" != xno && test x"$withval" != xyes], [AC_DEFINE_UNQUOTED([WALLET_SERVER], ["$withval"], [Define to the default server host name.])])]) AC_ARG_WITH([wallet-port], - [AC_HELP_STRING([--with-wallet-port=PORT], + [AS_HELP_STRING([--with-wallet-port=PORT], [Default wallet server port])], [AS_IF([test x"$withval" != xno && test x"$withval" != xyes], [AC_DEFINE_UNQUOTED([WALLET_PORT], [$withval], @@ -97,7 +97,7 @@ AS_IF([test x"$REMCTLD" != x], [Define to the full path to remctld to run remctl tests.])]) dnl Output section. -AC_CONFIG_HEADER([config.h]) +AC_CONFIG_HEADERS([config.h]) AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([tests/client/basic-t], [chmod +x tests/client/basic-t]) AC_CONFIG_FILES([tests/client/full-t], [chmod +x tests/client/full-t]) diff --git a/tests/data/perl.conf b/tests/data/perl.conf index 0c1e34e..1aad2a0 100644 --- a/tests/data/perl.conf +++ b/tests/data/perl.conf @@ -1,5 +1,8 @@ # Configuration for Perl tests. -*- perl -*- +# Default minimum version requirement. +$MINIMUM_VERSION = '5.010'; + # Wallet::Schema's version number is used to version the database schema and # requires upgrade SQL files for each version bump. Until this is replaced # with some better system, exclude it from version checking. diff --git a/tests/docs/spdx-license-t b/tests/docs/spdx-license-t index d829080..2841835 100755 --- a/tests/docs/spdx-license-t +++ b/tests/docs/spdx-license-t @@ -9,7 +9,7 @@ # The canonical version of this file is maintained in the rra-c-util package, # which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>. # -# Copyright 2018-2020 Russ Allbery <eagle@eyrie.org> +# Copyright 2018-2021 Russ Allbery <eagle@eyrie.org> # # Permission is hereby granted, free of charge, to any person obtaining a # copy of this software and associated documentation files (the "Software"), @@ -31,7 +31,7 @@ # # SPDX-License-Identifier: MIT -use 5.008; +use 5.010; use strict; use warnings; @@ -51,6 +51,9 @@ my @IGNORE = ( qr{ \A (NEWS|THANKS|TODO) \z }xms, # Package license should be fine qr{ \A README ( [.] .* )? \z }xms, # Package license should be fine qr{ \A (Makefile|libtool) \z }xms, # Generated file + qr{ ~ \z }xms, # Backup files + qr{ [.] l?a \z }xms, # Created by libtool + qr{ [.] o \z }xms, # Compiler objects qr{ [.] output \z }xms, # Test data ); my @IGNORE_PATHS = ( @@ -74,8 +77,7 @@ my @IGNORE_PATHS = ( qr{ \A php/run-tests [.] php \z }xms, # Created by phpize qr{ \A python/ .* [.] egg-info/ }xms, # Python build files qr{ \A tests/config/ (?!README) }xms, # Test configuration - qr{ [.] l?a \z }xms, # Created by libtool - qr{ [.] o \z }xms, # Compiler objects + qr{ \A tests/tmp/ }xms, # Temporary test files ); ## use critic |