X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=tests%2Fndbm%2Fndbm001.phpt;h=ef6a9065ef498bcc77f1b3acd02d452ad9f15c1f;hp=27012bedf6b43d8e4df0fde6edf0a73776770388;hb=c9384515a81cb64d345b299908b2852f51bb8e6e;hpb=7f77a893007a064d69773bae8caa14bd8ce83637

diff --git a/tests/ndbm/ndbm001.phpt b/tests/ndbm/ndbm001.phpt
index 27012be..ef6a906 100644
--- a/tests/ndbm/ndbm001.phpt
+++ b/tests/ndbm/ndbm001.phpt
@@ -3,36 +3,31 @@ ndbm
 --INI--
 psi.directory={PWD}:{PWD}/../../psi.d
 --SKIPIF--
-<?php 
+<?php
 extension_loaded("psi") or die("skip - need ext/psi");
-function_exists("psi\\dbm_open") or die("skip - need nbdm support");
+#function_exists("psi\\dbm_open") or die("skip - need nbdm support");
 ?>
 --FILE--
 ===TEST===
-<?php 
+<?php
 class db {
 	private $db;
-	
-	function __construct($file = "ndbm001.db", $o = psi\O_CREAT|psi\O_RDWR, $m = 0640) {
+
+	function __construct($file = __DIR__."/ndbm001.db", $o = psi\O_CREAT|psi\O_RDWR, $m = 0640) {
 		if (!$this->db = psi\dbm_open($file, $o, $m)) {
 			throw new Exception(psi\strerror(psi\errno()));
 		}
 	}
-	
+
 	function __destruct() {
 		psi\dbm_close($this->db);
+		array_map("unlink", glob(__DIR__."/ndbm001.db*"));
 	}
-	
+
 	function __set($k, $v) {
-		return psi\dbm_store($this->db, [
-				"dptr" => $k, 
-				"dsize" => strlen($k)
-			], [
-				"dptr" => $v,
-				"dsize" => strlen($v)
-			], psi\DBM_REPLACE);
+		return psi\dbm_store($this->db, $k, $v, psi\DBM_REPLACE);
 	}
-	
+
 	function __get($k) {
 		$val = psi\dbm_fetch($this->db, [
 			"dptr" => $k,
@@ -50,8 +45,8 @@ var_dump($db->key);
 ?>
 ===DONE===
 --CLEAN--
-<?php 
-@unlink("ndbm001.db");
+<?php
+array_map("unlink", glob(__DIR__."/ndbm001.db*"));
 ?>
 --EXPECT--
 ===TEST===