From 4d1d1a2832207877b24eed094fd3db104f8d95b0 Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Fri, 9 Mar 2018 00:35:04 +0200 Subject: [PATCH] Test thru perltidy. --- .appveyor.yml | 2 +- .gitignore | 1 + .perltidyrc | 3 +++ .tidyallrc | 4 ++++ .travis.yml | 2 +- run-tests.pl | 13 ++++++------- scripts/filter-inidivual-importing-tests.pl | 8 ++++---- tests/style/perltidy.t | 14 ++++++++++++++ tests/style/py-flake8.t | 2 +- tests/style/style-trailing-space.t | 7 +++---- 10 files changed, 38 insertions(+), 18 deletions(-) create mode 100644 .perltidyrc create mode 100644 .tidyallrc create mode 100644 tests/style/perltidy.t diff --git a/.appveyor.yml b/.appveyor.yml index 730b1666..2dea1ba0 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -20,7 +20,7 @@ install: - SET PERL_MB_OPT=--install_base C:/_P5 - SET PERL_MM_OPT=INSTALL_BASE=C:/_P5 - perl -v - - cpanm --notest File::Find::Object Task::FreecellSolver::Testing Test::TrailingSpace + - cpanm --notest File::Find::Object Perl::Tidy Task::FreecellSolver::Testing Test::Code::TidyAll Test::TrailingSpace - echo %PATH% build: off test_script: diff --git a/.gitignore b/.gitignore index 0d9956f7..aa58f216 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ *.pyc +.tidyall.d/ MANIFEST build/* data/cardsets/* diff --git a/.perltidyrc b/.perltidyrc new file mode 100644 index 00000000..540bb9c7 --- /dev/null +++ b/.perltidyrc @@ -0,0 +1,3 @@ +-ci=4 +-bl +-cti=0 diff --git a/.tidyallrc b/.tidyallrc new file mode 100644 index 00000000..718b4d8d --- /dev/null +++ b/.tidyallrc @@ -0,0 +1,4 @@ +[PerlTidy] +argv = -ci=4 -bl -cti=0 +ignore = **/{cmpdigest,valgrind,verify}--*.t +select = **/*.{pl,pm,t} diff --git a/.travis.yml b/.travis.yml index d99509c7..0af26123 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ before_install: - sudo apt-get install -y ack-grep cpanminus libperl-dev make perl python-glade2 python-gnome2 python-gnome2-dev python-gtk2 python-setuptools python-tk python3 python3-pip python3-setuptools python3-tk - sudo dpkg-divert --local --divert /usr/bin/ack --rename --add /usr/bin/ack-grep install: - - sudo cpanm Test::Differences Test::TrailingSpace + - sudo cpanm Perl::Tidy Test::Code::TidyAll Test::Differences Test::TrailingSpace - "`which python3` -m pip install --upgrade --user flake8 random2 six" - "sudo /usr/bin/python3 -m pip install --upgrade random2 six" - "`which python` -m pip install --upgrade --user random2 six" diff --git a/run-tests.pl b/run-tests.pl index 8e6db014..12704ec1 100644 --- a/run-tests.pl +++ b/run-tests.pl @@ -53,14 +53,13 @@ sub run_tests { require Test::Run::CmdLine::Prove; - my $p = - Test::Run::CmdLine::Prove->create( + my $p = Test::Run::CmdLine::Prove->create( { - 'args' => [@$tests], + 'args' => [@$tests], 'env_switches' => $ENV{'PROVE_SWITCHES'}, } ); - exit(! $p->run()); + exit( !$p->run() ); } } @@ -87,7 +86,7 @@ sub myglob local $ENV{FCS_PATH} = $fcs_path; local $ENV{FCS_SRC_PATH} = $abs_bindir; - local $ENV{FREECELL_SOLVER_QUIET} = 1; + local $ENV{FREECELL_SOLVER_QUIET} = 1; Env::Path->PATH->Prepend( File::Spec->catdir( Cwd::getcwd(), "board_gen" ), File::Spec->catdir( $abs_bindir, "t", "scripts" ), @@ -157,11 +156,11 @@ sub myglob my @tests = sort { ( basename($a) cmp basename($b) ) || ( $a cmp $b ) } - ( myglob("$abs_bindir/tests/*") ); + ( myglob("$abs_bindir/tests/*") ); if ($IS_WIN) { - @tests = grep {not (/pysolgtk/i or /import_v2/i)} @tests; + @tests = grep { not( /pysolgtk/i or /import_v2/i ) } @tests; } if ( defined($exclude_re_s) ) diff --git a/scripts/filter-inidivual-importing-tests.pl b/scripts/filter-inidivual-importing-tests.pl index 65e95657..78f7ffe1 100644 --- a/scripts/filter-inidivual-importing-tests.pl +++ b/scripts/filter-inidivual-importing-tests.pl @@ -8,17 +8,17 @@ use List::MoreUtils qw(none); my @m2; L_LOOP: -foreach my $l (io("scripts/gen_individual_importing_tests.py")->getlines()) +foreach my $l ( io("scripts/gen_individual_importing_tests.py")->getlines() ) { - if ($l =~ m/^for module_name/) + if ( $l =~ m/^for module_name/ ) { my @ms = $l =~ m{('pysollib\.[^']+')}g; - @m2 = (map { $_ =~ s/\A'//r =~ s/\'\z//r =~ tr#.#/#r } @ms); + @m2 = ( map { $_ =~ s/\A'//r =~ s/\'\z//r =~ tr#.#/#r } @ms ); last L_LOOP; } } -while (my $l = ) +while ( my $l = ) { chomp($l); print "$l\n" if none { $l =~ /$_/ } @m2; diff --git a/tests/style/perltidy.t b/tests/style/perltidy.t new file mode 100644 index 00000000..99421ab2 --- /dev/null +++ b/tests/style/perltidy.t @@ -0,0 +1,14 @@ +#!/usr/bin/perl + +use strict; +use warnings; + +if ( $ENV{FCS_TEST_SKIP_PERLTIDY} ) +{ + require Test::More; + Test::More::plan( 'skip_all' => + "Skipping perltidy test because FCS_TEST_SKIP_PERLTIDY was set" ); +} +require Test::Code::TidyAll; + +Test::Code::TidyAll::tidyall_ok( conf_file => ".tidyallrc", ); diff --git a/tests/style/py-flake8.t b/tests/style/py-flake8.t index 9e6361f8..ec51c706 100644 --- a/tests/style/py-flake8.t +++ b/tests/style/py-flake8.t @@ -9,7 +9,7 @@ use Test::Differences qw( eq_or_diff ); use File::Find::Object (); use String::ShellQuote qw/ shell_quote /; -if ($^O =~ /\AMSWin/) +if ( $^O =~ /\AMSWin/ ) { plan skip_all => "command line exceeded on ms windows."; } diff --git a/tests/style/style-trailing-space.t b/tests/style/style-trailing-space.t index d6443e73..9bf95c58 100644 --- a/tests/style/style-trailing-space.t +++ b/tests/style/style-trailing-space.t @@ -18,12 +18,11 @@ else my $finder = Test::TrailingSpace->new( { root => '.', - filename_regex => qr/(?:(?:\.(?:t|pm|pl|PL|yml|json|arc|vim|py|tcl))|README(?:\.md)?|Changes|LICENSE|MANIFEST|AUTHORS|COPYING)\z/, + filename_regex => +qr/(?:(?:\.(?:t|pm|pl|PL|yml|json|arc|vim|py|tcl))|README(?:\.md)?|Changes|LICENSE|MANIFEST|AUTHORS|COPYING)\z/, }, ); # TEST -$finder->no_trailing_space( - "No trailing space was found." -); +$finder->no_trailing_space("No trailing space was found.");