diff options
author | Remi Collet <remi@php.net> | 2017-09-13 12:20:16 +0200 |
---|---|---|
committer | Remi Collet <remi@php.net> | 2017-09-13 12:20:16 +0200 |
commit | 1edc5aea33aa7aeff489110c10f5e65a76e09d06 (patch) | |
tree | 13cc4d8c06057ff1627e718cadeee0d658c42e1f | |
parent | 351130856c0255abebad1dbec04d2404742a3b4f (diff) | |
parent | d99cd289257a97be3f5b344fe8de4bc3de85e609 (diff) | |
download | php-git-1edc5aea33aa7aeff489110c10f5e65a76e09d06.tar.gz |
Merge branch 'PHP-7.2'
* PHP-7.2:
fix tests for 32-bit
-rw-r--r-- | sapi/phpdbg/tests/exceptions_003.phpt | 2 | ||||
-rw-r--r-- | sapi/phpdbg/tests/stepping_001.phpt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sapi/phpdbg/tests/exceptions_003.phpt b/sapi/phpdbg/tests/exceptions_003.phpt index 1ffcf4246c..9d4abc0739 100644 --- a/sapi/phpdbg/tests/exceptions_003.phpt +++ b/sapi/phpdbg/tests/exceptions_003.phpt @@ -26,7 +26,7 @@ prompt> [L7 %s ECHO<1> "ok\n" 00009: } catch (Error $e) { prompt> ok [L7 %s FAST_RET ~%d try-catch(0) %s] -[L9 %s CATCH<-224> "Error" $e 1 %s] +[L9 %s CATCH<-%d> "Error" $e 1 %s] >00005: x(); 00006: } finally { 00007: print "ok\n"; diff --git a/sapi/phpdbg/tests/stepping_001.phpt b/sapi/phpdbg/tests/stepping_001.phpt index 2f25acc449..e8e32db0be 100644 --- a/sapi/phpdbg/tests/stepping_001.phpt +++ b/sapi/phpdbg/tests/stepping_001.phpt @@ -25,7 +25,7 @@ prompt> [L0 %s HANDLE_EXCEPTION 00005: } 00006: prompt> [L0 %s HANDLE_EXCEPTION %s] -[L9 %s CATCH<-128> "Exception" $e 1 %s] +[L9 %s CATCH<-%d> "Exception" $e 1 %s] >00008: foo(); 00009: } catch (Exception $e) { 00010: echo "ok"; |