com php-src: Fixed bug #70546 (ext/sysvshm: two broken tests on Solaris) by rainer.jung: ext/sysvshm/tests/002.phpt ext/sysvshm/tests/007.phpt
| From: | Xinchen Hui | Date: | Tue, 22 Sep 2015 04:06:09 +0000 |
| Subject: | com php-src: Fixed bug #70546 (ext/sysvshm: two broken tests on Solaris) by rainer.jung: ext/sysvshm/tests/002.phpt ext/sysvshm/tests/007.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-89098@lists.php.net to get a copy of this message | ||
Commit: b8ea991821753898ba30fa170b25eadd3fc703b2
Author: Xinchen Hui <laruence@gmail.com> Tue, 22 Sep 2015 12:06:09 +0800
Parents: e1dcfd2cf900995fba28866dfb52fa68171d1ab8
Branches: PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b8ea991821753898ba30fa170b25eadd3fc703b2
Log:
Fixed bug #70546 (ext/sysvshm: two broken tests on Solaris) by rainer.jung
Bugs:
https://bugs.php.net/70546
Changed paths:
M ext/sysvshm/tests/002.phpt
M ext/sysvshm/tests/007.phpt
Diff:
diff --git a/ext/sysvshm/tests/002.phpt b/ext/sysvshm/tests/002.phpt
index 4ae7a86..cf83b82 100644
--- a/ext/sysvshm/tests/002.phpt
+++ b/ext/sysvshm/tests/002.phpt
@@ -25,7 +25,7 @@ var_dump($s = shm_attach($key, 1024));
shm_remove($key);
var_dump($s = shm_attach($key, 1024));
shm_remove($s);
-var_dump(shm_attach($key, 1024, 0666));
+var_dump($s = shm_attach($key, 1024, 0666));
shm_remove($s);
var_dump($s = shm_attach($key, 1024));
diff --git a/ext/sysvshm/tests/007.phpt b/ext/sysvshm/tests/007.phpt
index d68fcea..584f13a 100644
--- a/ext/sysvshm/tests/007.phpt
+++ b/ext/sysvshm/tests/007.phpt
@@ -17,7 +17,6 @@ var_dump(shm_remove(0));
var_dump(shm_remove(""));
var_dump(shm_remove($s));
-var_dump(shm_remove($s));
shm_detach($s);
var_dump(shm_remove($s));
@@ -38,7 +37,6 @@ NULL
Warning: shm_remove() expects parameter 1 to be resource, string given in %s007.php on line %d
NULL
bool(true)
-bool(true)
Warning: shm_remove(): supplied resource is not a valid sysvshm resource in %s007..php on line %d
bool(false)