cvs: php4(PHP_4_3) /ext/interbase/tests .cvsignore 001.phpt 002.phpt 003.phpt 004.phpt 005.phpt 006.phpt extension interbase.inc skipif.inc

sniper Fri Apr 25 11:43:35 2003 EDT Added files: (Branch: PHP_4_3) /php4/ext/interbase/tests skipif.inc Removed files: /php4/ext/interbase/tests 001.phpt extension Modified files: /php4/ext/interbase/tests .cvsignore 002.phpt 003.phpt 004.phpt 005.phpt 006.phpt interbase.inc Log: MFH Index: php4/ext/interbase/tests/.cvsignore diff -u php4/ext/interbase/tests/.cvsignore:1.5 php4/ext/interbase/tests/.cvsignore:1.5.2.1 --- php4/ext/interbase/tests/.cvsignore:1.5 Tue Oct 22 04:55:58 2002 +++ php4/ext/interbase/tests/.cvsignore Fri Apr 25 11:43:35 2003 @@ -4,3 +4,4 @@ *.exp *.out *.php +ibase_test.tmp Index: php4/ext/interbase/tests/002.phpt diff -u php4/ext/interbase/tests/002.phpt:1.2 php4/ext/interbase/tests/002.phpt:1.2.4.1 --- php4/ext/interbase/tests/002.phpt:1.2 Tue Mar 19 11:52:41 2002 +++ php4/ext/interbase/tests/002.phpt Fri Apr 25 11:43:35 2003 @@ -1,14 +1,13 @@ --TEST-- InterBase: connect, close and pconnect --SKIPIF-- -<?php if (!extension_loaded("interbase")) print "skip"; ?> +<?php include("skipif.inc"); ?> --POST-- --GET-- --FILE-- -<? -/* $Id: 002.phpt,v 1.2 2002/03/19 16:52:41 ludoo Exp $ */ +<?php /* $Id: 002.phpt,v 1.2.4.1 2003/04/25 15:43:35 sniper Exp $ */ - require(dirname(__FILE__)."/interbase.inc"); + require("interbase.inc"); $test_base = dirname(__FILE__)."/ibase_test.tmp"; Index: php4/ext/interbase/tests/003.phpt diff -u php4/ext/interbase/tests/003.phpt:1.2 php4/ext/interbase/tests/003.phpt:1.2.4.1 --- php4/ext/interbase/tests/003.phpt:1.2 Tue Mar 19 11:52:41 2002 +++ php4/ext/interbase/tests/003.phpt Fri Apr 25 11:43:35 2003 @@ -1,16 +1,13 @@ --TEST-- InterBase: misc sql types (may take a while) --SKIPIF-- -<?php if (!extension_loaded("interbase")) print "skip"; ?> +<?php include("skipif.inc"); ?> --POST-- --GET-- --FILE-- -<? -/* $Id: 003.phpt,v 1.2 2002/03/19 16:52:41 ludoo Exp $ */ +<?php - require(dirname(__FILE__)."/interbase.inc"); - - $test_base = dirname(__FILE__)."/ibase_test.tmp"; + require("interbase.inc"); ibase_connect($test_base); @@ -29,7 +26,7 @@ )"); ibase_commit(); - /* if timefmt is not supported, suppress error here*/ + /* if timefmt is not supported, suppress error here */ @ibase_timefmt("%m/%d/%Y %H:%M:%S"); for($iter = 0; $iter < 10; $iter++){ @@ -81,13 +78,10 @@ echo " out: $row->V_INTEGER\n"; } ibase_free_result($sel); - }/* for($iter)*/ + } /* for($iter) */ ibase_close(); echo "end of test\n"; ?> --EXPECT-- - end of test - - Index: php4/ext/interbase/tests/004.phpt diff -u php4/ext/interbase/tests/004.phpt:1.2 php4/ext/interbase/tests/004.phpt:1.2.4.1 --- php4/ext/interbase/tests/004.phpt:1.2 Tue Mar 19 11:52:41 2002 +++ php4/ext/interbase/tests/004.phpt Fri Apr 25 11:43:35 2003 @@ -1,16 +1,13 @@ --TEST-- InterBase: BLOB test --SKIPIF-- -<?php if (!extension_loaded("interbase")) print "skip"; ?> +<?php include("skipif.inc"); ?> --POST-- --GET-- --FILE-- -<? -/* $Id: 004.phpt,v 1.2 2002/03/19 16:52:41 ludoo Exp $ */ +<?php - require(dirname(__FILE__)."/interbase.inc"); - - $test_base = dirname(__FILE__)."/ibase_test.tmp"; + require("interbase.inc"); ibase_connect($test_base); @@ -38,7 +35,8 @@ $q = ibase_query("select v_blob from test4 where v_integer = 1"); $row = ibase_fetch_object($q); $bl_h = ibase_blob_open($row->V_BLOB); - + + $blob = ''; while($piece = ibase_blob_get($bl_h, rand() % 1024)) $blob .= $piece; if($blob != $blob_str) @@ -63,6 +61,7 @@ $q = ibase_query("select v_blob from test4 where v_integer = 2"); $row = ibase_fetch_object($q); $bl_h = ibase_blob_open($row->V_BLOB); + $blob = ''; while($piece = ibase_blob_get($bl_h, rand() % 1024)) $blob .= $piece; if($blob != $blob_str) Index: php4/ext/interbase/tests/005.phpt diff -u php4/ext/interbase/tests/005.phpt:1.2 php4/ext/interbase/tests/005.phpt:1.2.4.1 --- php4/ext/interbase/tests/005.phpt:1.2 Tue Mar 19 11:52:41 2002 +++ php4/ext/interbase/tests/005.phpt Fri Apr 25 11:43:35 2003 @@ -1,16 +1,13 @@ --TEST-- InterBase: transactions --SKIPIF-- -<?php if (!extension_loaded("interbase")) print "skip"; ?> +<?php include("skipif.inc"); ?> --POST-- --GET-- --FILE-- -<? -/* $Id: 005.phpt,v 1.2 2002/03/19 16:52:41 ludoo Exp $ */ +<?php - require(dirname(__FILE__)."/interbase.inc"); - - $test_base = dirname(__FILE__)."/ibase_test.tmp"; + require("interbase.inc"); ibase_connect($test_base); Index: php4/ext/interbase/tests/006.phpt diff -u php4/ext/interbase/tests/006.phpt:1.2 php4/ext/interbase/tests/006.phpt:1.2.4.1 --- php4/ext/interbase/tests/006.phpt:1.2 Tue Mar 19 11:52:41 2002 +++ php4/ext/interbase/tests/006.phpt Fri Apr 25 11:43:35 2003 @@ -1,16 +1,13 @@ --TEST-- InterBase: binding (may take a while) --SKIPIF-- -<?php if (!extension_loaded("interbase")) print "skip"; ?> +<?php include("skipif.inc"); ?> --POST-- --GET-- --FILE-- -<? -/* $Id: 006.phpt,v 1.2 2002/03/19 16:52:41 ludoo Exp $ */ +<?php - require(dirname(__FILE__)."/interbase.inc"); - - $test_base = dirname(__FILE__)."/ibase_test.tmp"; + require("interbase.inc"); ibase_connect($test_base); Index: php4/ext/interbase/tests/interbase.inc diff -u php4/ext/interbase/tests/interbase.inc:1.1 php4/ext/interbase/tests/interbase.inc:1.1.16.1 --- php4/ext/interbase/tests/interbase.inc:1.1 Sun Aug 27 15:45:58 2000 +++ php4/ext/interbase/tests/interbase.inc Fri Apr 25 11:43:35 2003 @@ -1,9 +1,37 @@ -<? -/* $Id: interbase.inc,v 1.1 2000/08/27 19:45:58 ssb Exp $ */ +<?php + +/* $Id: interbase.inc,v 1.1.16.1 2003/04/25 15:43:35 sniper Exp $ */ /* used in tests */ srand((double)microtime()*1000000); +$test_base = dirname(__FILE__)."/ibase_test.tmp"; +@unlink($test_base); + +$name = dirname(__FILE__).tempnam("","CREATEDB"); +$ftmp = fopen($name,"w"); +fwrite($ftmp, +" + create database \"$test_base\"; + create table test1 (i integer, c varchar(100)); + commit; + insert into test1(i, c) values(1, 'test table created with isql'); + exit; +" +); +fclose($ftmp); + +/* set the correct binary */ +if (is_executable('isql')) { + $cmd = 'isql'; +} else { + $cmd = '/opt/interbase/bin/isql'; +} + +exec("$cmd -i $name 2>&1"); +@unlink($name); + + function out_table($table_name) { echo "--- $table_name ---\n"; @@ -74,4 +102,4 @@ return $n; } -?> \ No newline at end of file +?> Index: php4/ext/interbase/tests/skipif.inc +++ php4/ext/interbase/tests/skipif.inc <?php /* $Id: skipif.inc,v 1.1 2003/04/25 15:43:28 sniper Exp $ */ /* used in tests */ if (!extension_loaded("interbase")) print "skip"; if (!is_executable("isql") && !is_executable("/opt/interbase/bin/isql")) print "skip"; ?>