- Fixed tests on Windows

# The tests expected %s/test.inc in warnings and notices, but of course,
# on Windows, the directory separator is a backslash.
# Made this work in both worlds by testing for %stest.inc

diff --git a/ext/sybase_ct/tests/bug26407.phpt b/ext/sybase_ct/tests/bug26407.phpt
index c8a2d8f28f46bed499aaf0840d8721d90e39d4d9..35bf6df7ada3a70c727ec6d597ac20e07f0c8bda 100644 (file)
--- a/ext/sybase_ct/tests/bug26407.phpt
+++ b/ext/sybase_ct/tests/bug26407.phpt
@@ -80,7 +80,7 @@ bool(true)
     select "bar"   
   
 
-Notice: sybase_query(): Sybase:  Unexpected results, cancelling current in %s/test.inc on line %d
+Notice: sybase_query(): Sybase:  Unexpected results, cancelling current in %stest.inc on line %d
 <<< Return: resource
 array(1) {
   [0]=>

diff --git a/ext/sybase_ct/tests/test_fetch_object.phpt b/ext/sybase_ct/tests/test_fetch_object.phpt
index 699c9335ccb9a743eb1fc8f264e4438e57e64fc5..c23658fa35d37a5ee94e0942b836dfa8a2ba7882 100644 (file)
--- a/ext/sybase_ct/tests/test_fetch_object.phpt
+++ b/ext/sybase_ct/tests/test_fetch_object.phpt
@@ -65,7 +65,7 @@ article::__set_state(array(
    'lastchange' => '%s',
 ))
 
-Notice: sybase_fetch_object(): Sybase:  Class *** has not been declared in %s/test_fetch_object.php on line %d
+Notice: sybase_fetch_object(): Sybase:  Class *** has not been declared in %stest_fetch_object.php on line %d
 stdClass::__set_state(array(
    'id' => 1,
    'caption' => 'Hello',

diff --git a/ext/sybase_ct/tests/test_msghandler.phpt b/ext/sybase_ct/tests/test_msghandler.phpt
index 742dc684ad480f618dcb25f85da4d2136eaf1b13..d97fe3f76c96367c2849c2fba2623c6d47114c59 100644 (file)
--- a/ext/sybase_ct/tests/test_msghandler.phpt
+++ b/ext/sybase_ct/tests/test_msghandler.phpt
@@ -26,14 +26,14 @@ Sybase-CT server message handler
 ?>
 --EXPECTF--
 Nonexistant:     
-Warning: sybase_set_message_handler(): First argumented is expected to be a valid callback, 'function_does_not_exist' was given in %s/test.inc on line %d
+Warning: sybase_set_message_handler(): First argumented is expected to be a valid callback, 'function_does_not_exist' was given in %stest.inc on line %d
 bool(false)
 Static method:   bool(true)
 Instance method: bool(true)
 Lambda function: bool(true)
 Unset:           bool(true)
 Incorrect type:  
-Warning: sybase_set_message_handler(): First argumented is expected to be either NULL, an array or string, integer given in %s/test.inc on line %d
+Warning: sybase_set_message_handler(): First argumented is expected to be either NULL, an array or string, integer given in %stest.inc on line %d
 bool(false)
 Function:        bool(true)
 >>> Query: select getdate(NULL)

diff --git a/ext/sybase_ct/tests/test_unbuffered_query.phpt b/ext/sybase_ct/tests/test_unbuffered_query.phpt
index 74b10143b2eaf503d011e47792e07d8e66299089..b2be2f2304bf531b391b40806360068c7b45f21d 100644 (file)
--- a/ext/sybase_ct/tests/test_unbuffered_query.phpt
+++ b/ext/sybase_ct/tests/test_unbuffered_query.phpt
@@ -49,7 +49,7 @@ bool(true)
 resource(%d) of type (sybase-ct result)
 resource(%d) of type (Unknown)
 
-Warning: sybase_num_rows(): %d is not a valid Sybase result resource in %s/test_unbuffered_query.php on line %d
+Warning: sybase_num_rows(): %d is not a valid Sybase result resource in %stest_unbuffered_query.php on line %d
 bool(true)
 resource(%d) of type (sybase-ct result)
 int(%d)