- rename RUN_TESTS_ARGS to RUN_TESTS_SETTINGS to match other vars

Changed files:
    fix-test-run.patch -> 1.4
    php.spec -> 1.872

diff --git a/fix-test-run.patch b/fix-test-run.patch
index c0c0767d9aa6c2d1e86d45a281cc0ecc4a812c71..991330c4bc5d3baecaf2711774ecb415923dacc7 100644 (file)
--- a/fix-test-run.patch
+++ b/fix-test-run.patch
@@ -31,7 +31,7 @@
 +                      $(PHP_EXECUTABLE) -n -c $(top_builddir)/tmp-php.ini \
 +                      -d extension_dir=$(top_builddir)/modules/ -d 'extension=pcre.$(SHLIB_DL_SUFFIX_NAME)' \
 +                      $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -n -c $(top_builddir)/tmp-php.ini \
-+                      -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(RUN_TESTS_ARGS) $(TESTS); \
++                      -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(RUN_TESTS_SETTINGS) $(TESTS); \
        else \
                echo "ERROR: Cannot run tests without CLI sapi."; \
        fi

diff --git a/php.spec b/php.spec
index bdaf1f4ad880ae449b4ed9b7de92fbfc6f23ba55..2dee257f050c7b0eae64d7bd6c9a95f0dc1013bf 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -2126,7 +2126,7 @@ cp -af php_config.h.cli main/php_config.h
 cp -af Makefile.cli Makefile
 export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2
 unset TZ LANG LC_ALL || :
-%{__make} test RUN_TESTS_ARGS="-s test.log"
+%{__make} test RUN_TESTS_SETTINGS="-s test.log"
 unset NO_INTERACTION REPORT_EXIT_STATUS MALLOC_CHECK_
 
 # collect failed tests into cleanup script used in prep.