One more attempt to fix perltidy on Travis-CI

diff --git a/.travis.yml b/.travis.yml
index fa0b23bb769222c3d175cf3ecc8b07cfa0c811d2..a33ebecadee38fc962eaa00cc9347d6b9333d999 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ before_install:
   - sudo apt-get update -qq
   - sudo apt-get install libcdb-dev libdb-file-lock-perl libcrypt-pbkdf2-perl libdbd-sqlite3-perl libdbi-perl libgetopt-long-descriptive-perl libipc-run-perl libjson-perl libkrb5-dev libperl6-slurp-perl libreadonly-perl libsqlite3-dev libtest-minimumversion-perl libtest-perl-critic-perl libtest-pod-perl libtest-strict-perl pkg-config sqlite tinycdb
 env: AUTHOR_TESTING=1
-script: ./bootstrap && ./configure && make warnings && perltidy -pro=tests/data/perltidyrc tests/tools/heimdal-strength-t && diff -u tests/tools/heimdal-strength-t.tdy tests/tools/heimdal-strength-t && tests/runtests -v -o perl/critic && make check
+script: ./bootstrap && ./configure && make warnings && perltidy -pro=tests/data/perltidyrc tests/tools/heimdal-strength-t && diff -u tests/tools/heimdal-strength-t tests/tools/heimdal-strength-t.tdy && tests/runtests -v -o perl/critic && make check
 
 branches:
   only:

diff --git a/tests/tools/heimdal-strength-t b/tests/tools/heimdal-strength-t
index 290707f9177d0048b72f610826cb03a50e951d4e..3130fb197acc026e996a7e85654dadb433d3fcb0 100755 (executable)
--- a/tests/tools/heimdal-strength-t
+++ b/tests/tools/heimdal-strength-t
@@ -165,11 +165,8 @@ plan(tests => $count * 3 + 21);
 # Install the krb5.conf file with a configuration pointing to the test
 # CrackLib dictionary.
 my $datadir = $ENV{BUILD} ? "$ENV{BUILD}/data" : 'tests/data';
-my $krb5_conf = create_krb5_conf(
-    {
-        password_dictionary => "$datadir/dictionary",
-    }
-);
+my $krb5_conf
+  = create_krb5_conf({ password_dictionary => "$datadir/dictionary" });
 local $ENV{KRB5_CONFIG} = $krb5_conf;
 
 # Run the CrackLib password tests and based-on-principal tests from JSON.
@@ -247,11 +244,8 @@ SKIP: {
 # Install the krb5.conf file with configuration pointing to the SQLite
 # dictionary.
 my $sqlite_database = test_file_path('data/wordlist.sqlite');
-$krb5_conf = create_krb5_conf(
-    {
-        password_dictionary_sqlite => $sqlite_database,
-    }
-);
+$krb5_conf
+  = create_krb5_conf({ password_dictionary_sqlite => $sqlite_database });
 local $ENV{KRB5_CONFIG} = $krb5_conf;
 
 # Check whether we were built with SQLite support.  If so, run those tests.