Merge branch 'PHP-7.0'

* PHP-7.0:
  Split shmop/tests/002.phpt in two (all + non-root)
  Fix bug #70886 in shmop/tests/002.phpt

Author: mbeccati

ext/shmop/tests/002.phpt

@@ -8,14 +8,13 @@ edgarsandi - <[email protected]>
 		die('skip not for Windows');
 	}
 	if (!extension_loaded("shmop")) {
-
 		die("skip shmop() extension not available");
 	}
 ?>
 --FILE--
 <?php
 	$hex_shm_id = function(){
-		return rand(0, 9999);
+		return mt_rand(1338, 9999);
 	};
 
 echo PHP_EOL, '## shmop_open function tests ##';
@@ -34,20 +33,19 @@ echo PHP_EOL, '## shmop_open function tests ##';
 	// warning outputs: Shared memory segment size must be greater than zero
 	var_dump(shmop_open($hex_shm_id(), "c", 0666, 0));
 
-	// warning outputs: unable to get shared memory segment information
-	var_dump(shmop_open($hex_shm_id(), 'n', 0, 1024));
-
 echo PHP_EOL, '## shmop_read function tests ##';
 	// warning outputs: 3 parameters expected
 	var_dump(shmop_read());
 
 	// warning outputs: start is out of range
 	$shm_id = shmop_open($hex_shm_id(), 'n', 0600, 1024);
 	var_dump(shmop_read($shm_id, -10, 0));
+	shmop_delete($shm_id);
 
 	// warning outputs: count is out of range
 	$shm_id = shmop_open($hex_shm_id(), 'n', 0600, 1024);
 	var_dump(shmop_read($shm_id, 0, -10));
+	shmop_delete($shm_id);
 
 echo PHP_EOL, '## shmop_write function tests ##';
 	// warning outputs: 3 parameters expected
@@ -56,6 +54,7 @@ echo PHP_EOL, '## shmop_write function tests ##';
 	// warning outputs: offset out of range
 	$shm_id = shmop_open($hex_shm_id(), 'n', 0600, 1024);
 	var_dump(shmop_write($shm_id, 'text to try write', -10));
+	shmop_delete($shm_id);
 
 echo PHP_EOL, '## shmop_size function tests ##';
 	// warning outputs: 1 parameter expected
@@ -86,9 +85,6 @@ bool(false)
 Warning: shmop_open(): Shared memory segment size must be greater than zero in %s on line %d
 bool(false)
 
-Warning: shmop_open(): unable to get shared memory segment information 'Permission denied' in %s on line %d
-bool(false)
-
 ## shmop_read function tests ##
 Warning: shmop_read() expects exactly 3 parameters, 0 given in %s on line %d
 NULL

ext/shmop/tests/003.phpt

@@ -0,0 +1,33 @@
+--TEST--
+shmop extension error messages (non-root)
+--SKIPIF--
+<?php
+	if( substr(PHP_OS, 0, 3) == "WIN") {
+		die('skip not for Windows');
+	}
+	if (!extension_loaded("shmop")) {
+		die("skip shmop extension not available");
+	}
+	if (!extension_loaded("posix")) {
+		die("skip posix extension not available");
+	}
+	if (!posix_geteuid()) {
+		die("skip cannot run test as root");
+	}
+?>
+--FILE--
+<?php
+	$hex_shm_id = function(){
+		return mt_rand(1338, 9999);
+	};
+
+echo '## shmop_open function tests ##', PHP_EOL;
+	// warning outputs: unable to get shared memory segment information
+	var_dump(shmop_open($hex_shm_id(), 'n', 0, 1024));
+
+?>
+--EXPECTF--
+## shmop_open function tests ##
+
+Warning: shmop_open(): unable to get shared memory segment information 'Permission denied' in %s on line %d
+bool(false)