]> git.ipfire.org Git - thirdparty/automake.git/commitdiff
[ng] rename: am__tty_colors -> am.test-suite.tty-colors
authorStefano Lattarini <stefano.lattarini@gmail.com>
Fri, 27 Jul 2012 12:04:24 +0000 (14:04 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Fri, 27 Jul 2012 12:16:51 +0000 (14:16 +0200)
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
lib/am/color-tests.am
lib/am/parallel-tests.am
lib/am/serial-tests.am

index d2e2a7dfd763776a4395d0c68456d86b07cd5bb6..a7cf297edee8f3c94520d54d057cdabb5416d8ff 100644 (file)
@@ -14,7 +14,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-am__tty_colors = { \
+am.test-suite.tty-colors = { \
   if test "X$(AM_COLOR_TESTS)" = Xno; then \
     am__color_tests=no; \
   elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
index 86c30ef7f3fe3e86a3dd3d66b5a22eb66da9f04a..c480fc6e690fb5cf9ad9e0157cf7ceec0414b48f 100644 (file)
@@ -32,7 +32,7 @@ am__is_xfail_test = \
   $(if $(filter-out $(am__xfail_test_bases), \
                     $(patsubst $(srcdir)/%,%,$(1))),no,yes)
 am__runtest = \
-  $(am__tty_colors);                                                   \
+  $(am.test-suite.tty-colors);                                         \
   srcdir=$(srcdir); export srcdir;                                     \
 ## Creates the directory for the log file if needed.  Avoid extra forks.
   test x$(@D) = x. || test -d $(@D) || $(MKDIR_P) $(@D) || exit $$?;   \
@@ -314,7 +314,7 @@ am.test-suite.append-to-list-of-bases = \
 
 $(TEST_SUITE_LOG): $(am__test_logs) $(am__test_results)
        $(am.setup-test-harness-workdir)
-       @set +e; $(am__tty_colors); \
+       @set +e; $(am.test-suite.tty-colors); \
        fatal () { echo "fatal: making $@: $$*" >&2; exit 1; }; \
        workdir='$(am.test-suite.workdir)'; \
 ## Detect a possible circular dependency, and error out if it's found.
index 8850dbb9124eba4c2ce2bc2ba76d9ac1e9f39cbf..c6d7089513e6e6c0ca4115955fd6b10bba73a5ad 100644 (file)
@@ -39,7 +39,7 @@ check-TESTS: $(am__cooked_tests)
        @failed=0; all=0; xfail=0; xpass=0; skip=0; \
        srcdir=$(srcdir); export srcdir; \
        list='$(am__cooked_tests)'; \
-       $(am__tty_colors); \
+       $(am.test-suite.tty-colors); \
        is_xfail_test () { \
          case " $(strip $(am__cooked_xfail_tests)) " in \
            *" $$tst "*) return 0;; \