X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=syntax-checks.mk;h=375738be92fc9158d762d63a7c8edebb47cdaec0;hb=7df8b28cb170a6e67df30bd30f1753a43cf315aa;hp=77d2f42a453c3300a030c28957d3278ea5524c3d;hpb=27478539b094a2b0bee4f8a452bec552edcabdbe;p=platform%2Fupstream%2Fautomake.git

diff --git a/syntax-checks.mk b/syntax-checks.mk
index 77d2f42..375738b 100644
--- a/syntax-checks.mk
+++ b/syntax-checks.mk
@@ -1,6 +1,6 @@
 # Maintainer checks for Automake.  Requires GNU make.
 
-# Copyright (C) 2012 Free Software Foundation, Inc.
+# Copyright (C) 2012-2013 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
@@ -27,11 +27,14 @@ xtests := $(shell \
    fi; \
    for d in $$dirs; do \
      for s in tap sh; do \
-       ls $$d/t/*.$$s $$d/t/ax/*.$$s 2>/dev/null; \
+       ls $$d/t/ax/*.$$s $$d/t/*.$$s $$d/contrib/t/*.$$s 2>/dev/null; \
      done; \
    done | sort)
 
-xdefs = $(srcdir)/t/ax/test-init.sh $(srcdir)/defs $(srcdir)/defs-static.in
+xdefs = \
+  $(srcdir)/t/ax/am-test-lib.sh \
+  $(srcdir)/t/ax/test-lib.sh \
+  $(srcdir)/t/ax/test-defs.in
 
 ams := $(shell find $(srcdir) -name '*.dir' -prune -o -name '*.am' -print)
 
@@ -39,9 +42,8 @@ ams := $(shell find $(srcdir) -name '*.dir' -prune -o -name '*.am' -print)
 # guaranteed to work on my machine.
 syntax_check_rules = \
 $(sc_tests_plain_check_rules) \
-sc_diff_automake_in_automake \
-sc_diff_aclocal_in_automake \
-sc_perl_syntax \
+sc_diff_automake \
+sc_diff_aclocal \
 sc_no_brace_variable_expansions \
 sc_rm_minus_f \
 sc_no_for_variable_in_macro \
@@ -56,15 +58,17 @@ sc_perl_local \
 sc_AMDEP_TRUE_in_automake_in \
 sc_tests_make_without_am_makeflags \
 $(sc_obsolete_requirements_rules) \
+sc_tests_no_source_defs \
 sc_tests_obsolete_variables \
 sc_tests_here_document_format \
 sc_tests_command_subst \
-sc_tests_Exit_not_exit \
+sc_tests_exit_not_Exit \
 sc_tests_automake_fails \
 sc_tests_required_after_defs \
 sc_tests_overriding_macros_on_cmdline \
 sc_tests_plain_sleep \
 sc_tests_ls_t \
+sc_tests_executable \
 sc_m4_am_plain_egrep_fgrep \
 sc_tests_no_configure_in \
 sc_tests_PATH_SEPARATOR \
@@ -76,33 +80,32 @@ sc_tabs_in_texi \
 sc_at_in_texi
 
 ## These check avoids accidental configure substitutions in the source.
-## There are exactly 9 lines that should be modified from automake.in to
-## automake, and 10 lines that should be modified from aclocal.in to
-## aclocal; these wors out to 32 and 34 lines of diffs, respectively.
-sc_diff_automake_in_automake:
-	@if test `diff $(srcdir)/automake.in automake | wc -l` -ne 32; then \
-	  echo "found too many diffs between automake.in and automake" 1>&2; \
-	  diff -c $(srcdir)/automake.in automake; \
-	  exit 1; \
-	fi
-sc_diff_aclocal_in_aclocal:
-	@if test `diff $(srcdir)/aclocal.in aclocal | wc -l` -ne 34; then \
-	  echo "found too many diffs between aclocal.in and aclocal" 1>&2; \
-	  diff -c $(srcdir)/aclocal.in aclocal; \
-	  exit 1; \
-	fi
-
-## Syntax check with default Perl (on my machine, Perl 5).
-sc_perl_syntax:
-	@perllibdir="./lib$(PATH_SEPARATOR)$(srcdir)/lib" $(PERL) -c -w automake
-	@perllibdir="./lib$(PATH_SEPARATOR)$(srcdir)/lib" $(PERL) -c -w aclocal
+## There are exactly 8 lines that should be modified from automake.in to
+## automake, and 9 lines that should be modified from aclocal.in to
+## aclocal.
+automake_diff_no = 8
+aclocal_diff_no = 9
+sc_diff_automake sc_diff_aclocal: sc_diff_% :
+	@set +e; tmp=$*-diffs.tmp; \
+	 diff -u $(srcdir)/$*.in $* > $$tmp; test $$? -eq 1 || exit 1; \
+	 added=`grep -v '^+++ ' $$tmp | grep -c '^+'` || exit 1; \
+	 removed=`grep -v '^--- ' $$tmp | grep -c '^-'` || exit 1; \
+	 test $$added,$$removed = $($*_diff_no),$($*_diff_no) \
+	  || { \
+	    echo "Found unexpected diffs between $*.in and $*"; \
+	    echo "Lines added:   $$added"  ; \
+	    echo "Lines removed: $$removed"; \
+	    cat $$tmp >&2; \
+	    exit 1; \
+	  } >&1; \
+	rm -f $$tmp
 
 ## Expect no instances of '${...}'.  However, $${...} is ok, since that
 ## is a shell construct, not a Makefile construct.
 sc_no_brace_variable_expansions:
 	@if grep -v '^ *#' $(ams) | grep -F '$${' | grep -F -v '$$$$'; then \
 	  echo "Found too many uses of '\$${' in the lines above." 1>&2; \
-	  exit 1;				\
+	  exit 1; \
 	else :; fi
 
 ## Make sure 'rm' is called with '-f'.
@@ -112,7 +115,7 @@ sc_rm_minus_f:
 	   | grep -E '\<rm ([^-]|\-[^f ]*\>)'; \
 	then \
 	  echo "Suspicious 'rm' invocation." 1>&2; \
-	  exit 1;				\
+	  exit 1; \
 	else :; fi
 
 ## Never use something like "for file in $(FILES)", this doesn't work
@@ -216,6 +219,7 @@ sc_tests_make_without_am_makeflags:
 sc_tests_obsolete_variables:
 	@vars=" \
 	  using_tap \
+	  am_using_tap \
 	  test_prefer_config_shell \
 	  original_AUTOMAKE \
 	  original_ACLOCAL \
@@ -319,27 +323,26 @@ sc_tests_command_subst:
 	  exit 1; \
 	fi
 
-## Tests should never call exit directly, but use Exit.
-## This is so that the exit status is transported correctly across the 0 trap.
-## Ignore comments and our testsuite's own self tests.
-sc_tests_Exit_not_exit:
-	@found=false; for file in $(xtests); do \
-	  case $$file in */self-check-*) continue;; esac; \
-	  res=`sed -n -e '/^#/d' -e '/<<.*END/,/^END/b' -e '/<<.*EOF/,/^EOF/b' \
-	              -e '/exit [$$0-9]/p' $$file`; \
-	  if test -n "$$res"; then \
-	    echo "$$file:$$res"; \
-	    found=true; \
-	  fi; \
-	done; \
-	if $$found; then \
-	  echo 'Do not call plain "exit", use "Exit" instead, in above tests.' 1>&2; \
+## Tests should no longer call 'Exit', just 'exit'.  That's because we
+## now have in place a better workaround to ensure the exit status is
+## transported correctly across the exit trap.
+sc_tests_exit_not_Exit:
+	@if grep 'Exit' $(xtests) $(xdefs) | grep -Ev '^[^:]+: *#' | grep .; then \
+	  echo "Use 'exit', not 'Exit'; it's obsolete now." 1>&2; \
+	  exit 1; \
+	fi
+
+## Guard against obsolescent uses of ./defs in tests.  Now,
+## 'test-init.sh' should be used instead.
+sc_tests_no_source_defs:
+	@if grep -E '\. .*defs($$| )' $(xtests); then \
+	  echo "Source 'test-init.sh', not './defs'." 1>&2; \
 	  exit 1; \
 	fi
 
 ## Use AUTOMAKE_fails when appropriate
 sc_tests_automake_fails:
-	@if grep -v '^#' $(xtests) | grep '\$$AUTOMAKE.*&&.*[eE]xit'; then \
+	@if grep -v '^#' $(xtests) | grep '\$$AUTOMAKE.*&&.*exit'; then \
 	  echo 'Use AUTOMAKE_fails + grep to catch automake failures in the above tests.' 1>&2;  \
 	  exit 1; \
 	fi
@@ -374,16 +377,16 @@ sc_tests_overriding_macros_on_cmdline:
 # code paths.
 	@tests=`for t in $(xtests); do \
 	          case $$t in */make-dryrun.sh);; *) echo $$t;; esac; \
-		done`; \
+	        done`; \
 	if sed -e 's/ || .*//' -e 's/ && .*//' \
 	        -e 's/ DESTDIR=[^ ]*/ /' -e 's/ SHELL=[^ ]*/ /' \
 	        -e 's/ V=[^ ]*/ /' -e 's/ DISABLE_HARD_ERRORS=[^ ]*/ /' \
 	        -e "s/ DISTCHECK_CONFIGURE_FLAGS='[^']*'/ /" \
-		-e 's/ DISTCHECK_CONFIGURE_FLAGS="[^"]*"/ /' \
-		-e 's/ DISTCHECK_CONFIGURE_FLAGS=[^ ]/ /' \
+	        -e 's/ DISTCHECK_CONFIGURE_FLAGS="[^"]*"/ /' \
+	        -e 's/ DISTCHECK_CONFIGURE_FLAGS=[^ ]/ /' \
 	        -e "s/ exp='[^']*'/ /" \
-		-e 's/ exp="[^"]*"/ /' \
-		-e 's/ exp=[^ ]/ /' \
+	        -e 's/ exp="[^"]*"/ /' \
+	        -e 's/ exp=[^ ]/ /' \
 	      $$tests | grep '\$$MAKE .*='; then \
 	  echo 'Rewrite "$$MAKE foo=bar" as "foo=bar $$MAKE -e" in the above lines,' 1>&2; \
 	  echo 'it is more portable.' 1>&2; \
@@ -405,6 +408,19 @@ sc_tests_ls_t:
 	  exit 1; \
 	fi
 
+## Test scripts must be executable.
+sc_tests_executable:
+	@st=0; \
+	for f in $(xtests); do \
+	  case $$f in \
+	    t/ax/*|./t/ax/*|$(srcdir)/t/ax/*);; \
+	    *) test -x $$f || { echo "$$f: not executable" >&2; st=1; }; \
+	  esac; \
+	done; \
+	test $$st -eq 0 || echo '$@: some test scripts are not executable' >&2; \
+	exit $$st;
+
+
 ## Never use 'sleep 1' to create files with different timestamps.
 ## Use '$sleep' instead.  Some filesystems (e.g., Windows) have only
 ## a 2sec resolution.