Update hash tests for consistency in their titles and remove the skipif sections...

diff --git a/ext/hash/tests/adler32.phpt b/ext/hash/tests/adler32.phpt
index eab2a3f1fd8af74d466ed949eea7d1056a422be8..5b822b63a63e55237dab54fd3e1c118cecca50eb 100644 (file)
--- a/ext/hash/tests/adler32.phpt
+++ b/ext/hash/tests/adler32.phpt
@@ -1,7 +1,5 @@
 --TEST--
-ADLER32
---SKIPIF--
-<?php extension_loaded('hash') or die('skip'); ?>
+Hash: ADLER32 algorithm
 --FILE--
 <?php
 echo hash('adler32', ''), "\n";

diff --git a/ext/hash/tests/bug52240.phpt b/ext/hash/tests/bug52240.phpt
index 6e0c8f650d15769b2e020a1b3301c390246c245b..911912bf0479eacc871619661b244c7a117fb377 100644 (file)
--- a/ext/hash/tests/bug52240.phpt
+++ b/ext/hash/tests/bug52240.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #52240 (hash_copy() does not copy the HMAC key, causes wrong results and PHP crashes)
---SKIPIF--
-<?php extension_loaded('hash') or die('skip'); ?>
 --FILE--
 <?php
 

diff --git a/ext/hash/tests/bug64745.phpt b/ext/hash/tests/bug64745.phpt
index 427f89b72875f2aaca16479fa93b98cf8902110c..2bed29e6dd58e268f97244edabcaff40aa1fc0fd 100644 (file)
--- a/ext/hash/tests/bug64745.phpt
+++ b/ext/hash/tests/bug64745.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Bug #64745 hash_pbkdf2() truncates data when using default length and hex output
---SKIPIF--
-<?php extension_loaded('hash') or die('skip'); ?>
+Bug #64745 (hash_pbkdf2() truncates data when using default length and hex output)
 --FILE--
 <?php
 $hash = hash_pbkdf2('sha1', 'password', 'salt', 1, 0);

diff --git a/ext/hash/tests/bug70312.phpt b/ext/hash/tests/bug70312.phpt
index 6978feb65b88d10bbcf390728d28ea15208a016f..87d72eb6aa1c36e0cd93b04ed0fb241c02e868ae 100644 (file)
--- a/ext/hash/tests/bug70312.phpt
+++ b/ext/hash/tests/bug70312.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Bug #70312 HAVAL gives wrong hashes in specific cases
---SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
+Bug #70312 (HAVAL gives wrong hashes in specific cases)
 --FILE--
 <?php
 var_dump(hash('haval128,5', '1234567890123456789012345678901234567890123456789012345678901234'));
@@ -15,4 +13,4 @@ string(32) "f3f0d23819b87228b4b70ee350afaa9d"
 string(40) "aded6485e137f11d7292212ba3fa961714df0564"
 string(48) "e53da2b16269fe732e9a898a96707a9f28404d7333b02286"
 string(56) "c574fb307f0817b514b9bb2e7c4bfaffb7ad667aca3c8b523fefcf10"
-string(64) "fb73c19300b14d5cb393d929bf005e6c2d459a4c9c009e9813af1d2d3637ee8f"
\ No newline at end of file
+string(64) "fb73c19300b14d5cb393d929bf005e6c2d459a4c9c009e9813af1d2d3637ee8f"

diff --git a/ext/hash/tests/bug73127.phpt b/ext/hash/tests/bug73127.phpt
index 78113de7ec4a3652d4a89605b38c969c76c210c3..4b1578a6bc5563deb57ade28d250eaf8a136c160 100644 (file)
--- a/ext/hash/tests/bug73127.phpt
+++ b/ext/hash/tests/bug73127.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #73127 (gost-crypto hash incorrect if input data contains long 0xFF sequence)
---SKIPIF--
-<?php if(!extension_loaded('hash')) die('skip hash extension not loaded'); ?>
 --FILE--
 <?php
 

diff --git a/ext/hash/tests/crc32.phpt b/ext/hash/tests/crc32.phpt
index 3862fb17a6a009ee4b67940d4099ad177eff3451..80c6bb0286342ce3fa40f3a51f5c78680fcbfffa 100644 (file)
--- a/ext/hash/tests/crc32.phpt
+++ b/ext/hash/tests/crc32.phpt
@@ -1,7 +1,5 @@
 --TEST--
-CRC32
---SKIPIF--
-<?php extension_loaded('hash') or die('skip'); ?>
+Hash: CRC32 algorithm
 --FILE--
 <?php
 echo hash('crc32', ''), "\n";

diff --git a/ext/hash/tests/fnv132.phpt b/ext/hash/tests/fnv132.phpt
index 051386ab75900a95f0c7c9fc84a53b696516ad45..914ce46f354c875d2dbabccfaee78a3e3a475e58 100644 (file)
--- a/ext/hash/tests/fnv132.phpt
+++ b/ext/hash/tests/fnv132.phpt
@@ -1,7 +1,5 @@
 --TEST--
-FNV
---SKIPIF--
-<?php extension_loaded('hash') or die ('Skip - hash extension not available'); ?>
+Hash: FNV132 algorithm
 --FILE--
 <?php
 

diff --git a/ext/hash/tests/fnv164.phpt b/ext/hash/tests/fnv164.phpt
index b5e69420a62f9d9299929aee4ca1bbe45fdf9deb..8ff7304a7bfc5a4b14059917334833aaae4830dc 100644 (file)
--- a/ext/hash/tests/fnv164.phpt
+++ b/ext/hash/tests/fnv164.phpt
@@ -1,7 +1,5 @@
 --TEST--
-FNV
---SKIPIF--
-<?php extension_loaded('hash') or die ('Skip - hash extension not available'); ?>
+Hash: FNV164 algorithm
 --FILE--
 <?php
 

diff --git a/ext/hash/tests/fnv1a32.phpt b/ext/hash/tests/fnv1a32.phpt
index 8297c7b920200c25af3397644fac37952f0e783c..d2e01f79987572bb206565eb3c7a70c9aeab8482 100644 (file)
--- a/ext/hash/tests/fnv1a32.phpt
+++ b/ext/hash/tests/fnv1a32.phpt
@@ -1,7 +1,5 @@
 --TEST--
-FNV
---SKIPIF--
-<?php extension_loaded('hash') or die ('Skip - hash extension not available'); ?>
+Hash: FNV1a32 algorithm
 --FILE--
 <?php
 

diff --git a/ext/hash/tests/fnv1a64.phpt b/ext/hash/tests/fnv1a64.phpt
index 8fd206ada45e0df1f41a9760c74cabaf866aa0bc..870c6ced0cc5cd0d84b02db83f0687e7f6fa36a8 100644 (file)
--- a/ext/hash/tests/fnv1a64.phpt
+++ b/ext/hash/tests/fnv1a64.phpt
@@ -1,7 +1,5 @@
 --TEST--
-FNV
---SKIPIF--
-<?php extension_loaded('hash') or die ('Skip - hash extension not available'); ?>
+Hash: FNV1a64 algorithm
 --FILE--
 <?php
 

diff --git a/ext/hash/tests/gost.phpt b/ext/hash/tests/gost.phpt
index 6ce00242b1a409f35140414935e106c9bb6d1509..19135748171348a7b4910131d6c807c5644abcff 100644 (file)
--- a/ext/hash/tests/gost.phpt
+++ b/ext/hash/tests/gost.phpt
@@ -1,7 +1,5 @@
 --TEST--
-gost
---SKIPIF--
-<?php extension_loaded('hash') or die('skip'); ?>
+Hash: gost algorithm
 --FILE--
 <?php
 echo hash('gost', ''), "\n";

diff --git a/ext/hash/tests/hash-clone.phpt b/ext/hash/tests/hash-clone.phpt
index 9a067d73aef284a97cb4eaa9e0844fe83a241f61..7229b2a23efd3cd472296385d4592dafdf513548 100644 (file)
--- a/ext/hash/tests/hash-clone.phpt
+++ b/ext/hash/tests/hash-clone.phpt
@@ -1,7 +1,5 @@
 --TEST--
-hash_copy() via clone
---SKIPIF--
-<?php extension_loaded('hash') or die('skip'); ?>
+Hash: hash_copy() via clone
 --FILE--
 <?php
 

diff --git a/ext/hash/tests/hash_algos.phpt b/ext/hash/tests/hash_algos.phpt
index 0014f95b1d50b3496075446a4bb93357d28fa3a5..be8b3fde4cb576c8477e257aae523473f92b75cf 100644 (file)
--- a/ext/hash/tests/hash_algos.phpt
+++ b/ext/hash/tests/hash_algos.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Test hash_algos() function : basic functionality 
---SKIPIF--
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
+Hash: hash_algos() function : basic functionality
 --FILE--
 <?php
 

diff --git a/ext/hash/tests/hash_copy_001.phpt b/ext/hash/tests/hash_copy_001.phpt
index 411b5d033dace537c51ae349ad6775d97df4538b..3811771dfc27d527457000338cf1e9e96a8fd641 100644 (file)
--- a/ext/hash/tests/hash_copy_001.phpt
+++ b/ext/hash/tests/hash_copy_001.phpt
@@ -1,7 +1,5 @@
 --TEST--
-hash_copy() basic tests
---SKIPIF--
-<?php extension_loaded('hash') or die('skip'); ?>
+Hash: hash_copy() basic tests
 --FILE--
 <?php
 

diff --git a/ext/hash/tests/hash_copy_002.phpt b/ext/hash/tests/hash_copy_002.phpt
index 5fbbf5b4d8b6c1c581ec5f0a9473a8344b469c48..81f80204526363318427205bcfd4f6aaf05161fa 100644 (file)
--- a/ext/hash/tests/hash_copy_002.phpt
+++ b/ext/hash/tests/hash_copy_002.phpt
@@ -1,7 +1,5 @@
 --TEST--
-hash_copy() errors
---SKIPIF--
-<?php extension_loaded('hash') or die('skip'); ?>
+Hash: hash_copy() errors
 --FILE--
 <?php
 

diff --git a/ext/hash/tests/hash_equals.phpt b/ext/hash/tests/hash_equals.phpt
index 8fdf22967e77857767d8fe32222d854f82c93b96..0c8ab42f93b816d73151a3e2d08ae6b182f067e5 100644 (file)
--- a/ext/hash/tests/hash_equals.phpt
+++ b/ext/hash/tests/hash_equals.phpt
@@ -1,7 +1,5 @@
 --TEST--
-hash_equals() function
---SKIPIF--
-<?php if(!extension_loaded('hash')) die('skip hash extension not loaded'); ?>
+Hash: hash_equals() test
 --FILE--
 <?php
 var_dump(hash_equals("same", "same"));

diff --git a/ext/hash/tests/hash_error.phpt b/ext/hash/tests/hash_error.phpt
index 8317a56e1415f75565dc8b18d2b0e5b180fbd9c1..ca5d03abb8d85422dad26b513f086186383248eb 100644 (file)
--- a/ext/hash/tests/hash_error.phpt
+++ b/ext/hash/tests/hash_error.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Test hash() function : error conditions 
---SKIPIF--
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
+Hash: hash() function : error conditions 
 --FILE--
 <?php
 
@@ -45,4 +43,4 @@ NULL
 
 Warning: hash(): Unknown hashing algorithm: foo in %s on line %d
 bool(false)
-===Done===
\ No newline at end of file
+===Done===

diff --git a/ext/hash/tests/hash_file_basic.phpt b/ext/hash/tests/hash_file_basic.phpt
index f655421904ffd98cf10a0ea811a23c4f4aef5df1..0ee48c6d1002c58ad8aa83a467c7c9cf7e45872a 100644 (file)
--- a/ext/hash/tests/hash_file_basic.phpt
+++ b/ext/hash/tests/hash_file_basic.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Test hash_file() function : basic functionality 
---SKIPIF--
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
+Hash: hash_file() function : basic functionality 
 --CREDITS--
 Felix De Vliegher <felix.devliegher@gmail.com>
 --FILE--

diff --git a/ext/hash/tests/hash_file_basic1.phpt b/ext/hash/tests/hash_file_basic1.phpt
index 2e088cebe626a921df5fa4781bea55d463909f01..474410c7823769659bf862cb7f394fca90ba73f8 100644 (file)
--- a/ext/hash/tests/hash_file_basic1.phpt
+++ b/ext/hash/tests/hash_file_basic1.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Test hash_file() function : basic functionality 
---SKIPIF--
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
+Hash: hash_file() function : basic functionality 
 --FILE--
 <?php
 

diff --git a/ext/hash/tests/hash_file_error.phpt b/ext/hash/tests/hash_file_error.phpt
index 96c41e643219a2242dbb30c5d250e1cc34d20a1a..e41d951366a22e0e3d5acedb5e618a036b93fd4b 100644 (file)
--- a/ext/hash/tests/hash_file_error.phpt
+++ b/ext/hash/tests/hash_file_error.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Test hash_file() function : error conditions 
---SKIPIF--
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
+Hash: hash_file() function : error conditions 
 --CREDITS--
 Felix De Vliegher <felix.devliegher@gmail.com>
 --FILE--

diff --git a/ext/hash/tests/hash_hkdf_basic.phpt b/ext/hash/tests/hash_hkdf_basic.phpt
index 06b5dac2cd0e4b3693116eaf65733a74357e25f4..7cd5f7e22e51b6605eb38e1ebc3a3b49a567e1a6 100644 (file)
--- a/ext/hash/tests/hash_hkdf_basic.phpt
+++ b/ext/hash/tests/hash_hkdf_basic.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Test hash_hkdf() function: basic functionality
---SKIPIF--
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
+Hash: hash_hkdf() function: basic functionality
 --FILE--
 <?php
 

diff --git a/ext/hash/tests/hash_hkdf_edges.phpt b/ext/hash/tests/hash_hkdf_edges.phpt
index 633efa4301a0ea84c940fbb8bbb49f668665157c..82acdbab04ffba1086c022b21e7164aab707f067 100644 (file)
--- a/ext/hash/tests/hash_hkdf_edges.phpt
+++ b/ext/hash/tests/hash_hkdf_edges.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Test hash_hkdf() function: edge cases
---SKIPIF--
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
+Hash: hash_hkdf() function: edge cases
 --FILE--
 <?php
 

diff --git a/ext/hash/tests/hash_hkdf_error.phpt b/ext/hash/tests/hash_hkdf_error.phpt
index ddda8df43bc40ce441e40a284d4f43a52e22f766..b833054e8095447abebda9fcc8998a7427c6601f 100644 (file)
--- a/ext/hash/tests/hash_hkdf_error.phpt
+++ b/ext/hash/tests/hash_hkdf_error.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Test hash_hkdf() function: error conditions
---SKIPIF--
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
+Hash: hash_hkdf() function: error conditions
 --FILE--
 <?php
 

diff --git a/ext/hash/tests/hash_hkdf_rfc5869.phpt b/ext/hash/tests/hash_hkdf_rfc5869.phpt
index d1ad9961f48501a699b41263aac66868f05e2eac..5652bff5ef609167f5cc48aec28f290a328ce5d9 100644 (file)
--- a/ext/hash/tests/hash_hkdf_rfc5869.phpt
+++ b/ext/hash/tests/hash_hkdf_rfc5869.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Test hash_hkdf() function: RFC 5869 test vectors
---SKIPIF--
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
+Hash: hash_hkdf() function: RFC 5869 test vectors
 --FILE--
 <?php
 

diff --git a/ext/hash/tests/hash_hmac_algos.phpt b/ext/hash/tests/hash_hmac_algos.phpt
index 89877b7c12429d9aeaa9bbce0a556f406acca5f1..481aad792f2833ad393ceb8aa234fa4754e12b7a 100644 (file)
--- a/ext/hash/tests/hash_hmac_algos.phpt
+++ b/ext/hash/tests/hash_hmac_algos.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Test hash_hmac_algos() function : basic functionality 
---SKIPIF--
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
+Hash: hash_hmac_algos() function : basic functionality 
 --FILE--
 <?php
 

diff --git a/ext/hash/tests/hash_hmac_basic.phpt b/ext/hash/tests/hash_hmac_basic.phpt
index 327cb5828128077b15f066c26210e4c08a713ddf..f4606be989b23933031644d52b3aa7d56ab8a7ab 100644 (file)
--- a/ext/hash/tests/hash_hmac_basic.phpt
+++ b/ext/hash/tests/hash_hmac_basic.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Test hash_file() function : basic functionality 
---SKIPIF--
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
+Hash: hash_file() function : basic functionality 
 --FILE--
 <?php
 

diff --git a/ext/hash/tests/hash_hmac_error.phpt b/ext/hash/tests/hash_hmac_error.phpt
index bff478a55e52c871eda2789e894a7d33333e8e29..e03527f442ccd0c8e72991998de4095822698a06 100644 (file)
--- a/ext/hash/tests/hash_hmac_error.phpt
+++ b/ext/hash/tests/hash_hmac_error.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Test hash_hmac() function : basic functionality 
---SKIPIF--
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
+Hash: hash_hmac() function : basic functionality 
 --FILE--
 <?php
 /*

diff --git a/ext/hash/tests/hash_hmac_file_basic.phpt b/ext/hash/tests/hash_hmac_file_basic.phpt
index 8ac248756c4d48927bd3716309e2e5814f59b159..c4d38b4689c013fbb45f7a4835600671d94344ae 100644 (file)
--- a/ext/hash/tests/hash_hmac_file_basic.phpt
+++ b/ext/hash/tests/hash_hmac_file_basic.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Test hash_hmac_file() function : basic functionality 
---SKIPIF--
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
+Hash: hash_hmac_file() function : basic functionality
 --FILE--
 <?php
 

diff --git a/ext/hash/tests/hash_hmac_file_error.phpt b/ext/hash/tests/hash_hmac_file_error.phpt
index 29adbddba8f63c5b31e4a7f5c51e8be8df940815..504e264599d44bad018b9cacb230b680d82878c3 100644 (file)
--- a/ext/hash/tests/hash_hmac_file_error.phpt
+++ b/ext/hash/tests/hash_hmac_file_error.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Test hash_hmac_file() function : basic functionality 
---SKIPIF--
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
+Hash: hash_hmac_file() function : basic functionality 
 --FILE--
 <?php
 

diff --git a/ext/hash/tests/hash_init_error.phpt b/ext/hash/tests/hash_init_error.phpt
index 95c67dad60726e9d2e8105881d91a1bf8b1dfd7f..e941aabca5854c005e66f71e5e783eff608ef763 100644 (file)
--- a/ext/hash/tests/hash_init_error.phpt
+++ b/ext/hash/tests/hash_init_error.phpt
@@ -1,9 +1,5 @@
 --TEST--
-hash_init() function - errors test
---SKIPIF--
-<?php
-if (!extension_loaded('hash')) die('skip hash extension not available');
-?>
+Hash: hash_init() function - errors test
 --FILE--
 <?php
 echo "*** Testing hash_init(): error conditions ***\n";

diff --git a/ext/hash/tests/hash_pbkdf2_basic.phpt b/ext/hash/tests/hash_pbkdf2_basic.phpt
index 17610dfedc5688d7789258fecb85aa6d75839a0e..71187a0fdd9a97764599376eef40b612f8dae4eb 100644 (file)
--- a/ext/hash/tests/hash_pbkdf2_basic.phpt
+++ b/ext/hash/tests/hash_pbkdf2_basic.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Test hash_pbkdf2() function : basic functionality
---SKIPIF--
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
+Hash: hash_pbkdf2() function : basic functionality
 --FILE--
 <?php
 

diff --git a/ext/hash/tests/hash_pbkdf2_error.phpt b/ext/hash/tests/hash_pbkdf2_error.phpt
index 5636a532a4b0c50501189dc600ff7a469414d7da..c0a76e17b4b6ea8be9bf98952d06f0e4124e5702 100644 (file)
--- a/ext/hash/tests/hash_pbkdf2_error.phpt
+++ b/ext/hash/tests/hash_pbkdf2_error.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Test hash_pbkdf2() function : error functionality
---SKIPIF--
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
+Hash: Test hash_pbkdf2() function : error functionality
 --FILE--
 <?php
 

diff --git a/ext/hash/tests/hash_update_file.phpt b/ext/hash/tests/hash_update_file.phpt
index 488be4741163346ad2f631811fd7fe5aea5dd5f1..bedaa73879892d3bad5b282446cf7e0b197dac3b 100644 (file)
--- a/ext/hash/tests/hash_update_file.phpt
+++ b/ext/hash/tests/hash_update_file.phpt
@@ -1,11 +1,7 @@
 --TEST--
-hash_update_file() function - basic test
+Hash: hash_update_file() test
 --CREDITS--
 marcosptf - <marcosptf@yahoo.com.br> - @phpsp - sao paulo - br
---SKIPIF--
-<?php
-if (!extension_loaded('hash')) die('skip hash extension not available');
-?>
 --FILE--
 <?php
 $filePath = __DIR__ . DIRECTORY_SEPARATOR . 'hash_update_stream.txt';

diff --git a/ext/hash/tests/hash_update_stream.phpt b/ext/hash/tests/hash_update_stream.phpt
index 86d69b1f2483acd256e08f26a0a5825e9c8c129e..fd5f776539cf6ffef831c3975d70e29768e34c75 100644 (file)
--- a/ext/hash/tests/hash_update_stream.phpt
+++ b/ext/hash/tests/hash_update_stream.phpt
@@ -1,11 +1,7 @@
 --TEST--
-int hash_update_stream ( resource $context , resource $handle [, int $length = -1 ] );
+Hash: hash_update_stream() test
 --CREDITS--
 marcosptf - <marcosptf@yahoo.com.br> - @phpsp - sao paulo - br
---SKIPIF--
-<?php
-if (!extension_loaded('hash')) die('skip hash extension not available');
-?>
 --FILE--
 <?php
 $fp = tmpfile();

diff --git a/ext/hash/tests/haval.phpt b/ext/hash/tests/haval.phpt
index 16db2fa6949afdbb8924c83b5707395e49fab60c..f8c5c67df12664d3e45ba2f38a75a95e3b7839a8 100644 (file)
--- a/ext/hash/tests/haval.phpt
+++ b/ext/hash/tests/haval.phpt
@@ -1,7 +1,5 @@
 --TEST--
-haval algorithm (multi-vector, multi-pass, multi-width)
---SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
+Hash: haval algorithm (multi-vector, multi-pass, multi-width)
 --FILE--
 <?php
 echo "Empty String\n";

diff --git a/ext/hash/tests/hmac-md5.phpt b/ext/hash/tests/hmac-md5.phpt
index 283285a54420f079eedb3689e93522c3f2b95469..38f204a3562cfce2b5f9ae7d798831843f5bf45d 100644 (file)
--- a/ext/hash/tests/hmac-md5.phpt
+++ b/ext/hash/tests/hmac-md5.phpt
@@ -1,7 +1,5 @@
 --TEST--
-hmac-md5 algorithm
---SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
+Hash: hmac-md5 algorithm
 --FILE--
 <?php
 /* Test Vectors from RFC 2104 */

diff --git a/ext/hash/tests/joaat.phpt b/ext/hash/tests/joaat.phpt
index fa310a96e2bfa3aa265d9594618b0d62f6082cb3..a8a5566aba33407082678626f86923716840efba 100644 (file)
--- a/ext/hash/tests/joaat.phpt
+++ b/ext/hash/tests/joaat.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Jenkins's one-at-a-time
---SKIPIF--
-<?php extension_loaded('hash') or die ('Skip - hash extension not available'); ?>
+Hash: Jenkins's one-at-a-time
 --FILE--
 <?php
 $tests = array(

diff --git a/ext/hash/tests/md2.phpt b/ext/hash/tests/md2.phpt
index c98ad34054e1030f5874efb6c6288fbde226f093..8ee023c1cbb08d0fa149bce799d7fcdf58878029 100644 (file)
--- a/ext/hash/tests/md2.phpt
+++ b/ext/hash/tests/md2.phpt
@@ -1,7 +1,5 @@
 --TEST--
-md2 algorithm
---SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
+Hash: md2 algorithm
 --FILE--
 <?php
 echo hash('md2', '') . "\n";

diff --git a/ext/hash/tests/md4.phpt b/ext/hash/tests/md4.phpt
index 8d90429076d90acdca3380856e78b7e78b125d95..ee9d60d2409f66be55c76babb46ba885c0181345 100644 (file)
--- a/ext/hash/tests/md4.phpt
+++ b/ext/hash/tests/md4.phpt
@@ -1,7 +1,5 @@
 --TEST--
-md4 algorithm
---SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
+Hash: md4 algorithm
 --FILE--
 <?php
 /* RFC 1320 vectors */

diff --git a/ext/hash/tests/md5.phpt b/ext/hash/tests/md5.phpt
index d56f0b91a0f76cd92f1f10e4b4a48fab33c5e3ad..b51273f9c7bf1e7c8b725126f3f6cb792483bd30 100644 (file)
--- a/ext/hash/tests/md5.phpt
+++ b/ext/hash/tests/md5.phpt
@@ -1,7 +1,5 @@
 --TEST--
-md5 algorithm
---SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
+Hash: md5 algorithm
 --FILE--
 <?php
 echo hash('md5', '') . "\n";

diff --git a/ext/hash/tests/mhash_001.phpt b/ext/hash/tests/mhash_001.phpt
index e8aac9b5e00d6c078995ef953d7adcc4b4368010..71d6d20df69fb9fa8abe34995e927b7937c9310a 100644 (file)
--- a/ext/hash/tests/mhash_001.phpt
+++ b/ext/hash/tests/mhash_001.phpt
@@ -1,9 +1,7 @@
 --TEST--
-mhash() test
+MHash: mhash() test
 --SKIPIF--
-<?php
-       include "skip_mhash.inc";
-?>
+<?php if(!function_exists('mhash')) { die('skip mhash compatibility layer not available'); } ?>
 --FILE--
 <?php
 

diff --git a/ext/hash/tests/mhash_002.phpt b/ext/hash/tests/mhash_002.phpt
index 45cf09fb7718fd57ef33d0a87f797075b2229002..7d8a71a0a40d068d4dfb8ca1b04f9f4162711dcb 100644 (file)
--- a/ext/hash/tests/mhash_002.phpt
+++ b/ext/hash/tests/mhash_002.phpt
@@ -1,9 +1,7 @@
 --TEST--
-mhash_get_block_size() & mhash_get_hash_name() test
+MHash: mhash_get_block_size() & mhash_get_hash_name() test
 --SKIPIF--
-<?php
-       include "skip_mhash.inc";
-?>
+<?php if(!function_exists('mhash')) { die('skip mhash compatibility layer not available'); } ?>
 --FILE--
 <?php
 $supported_hash_al = array(

diff --git a/ext/hash/tests/mhash_003.phpt b/ext/hash/tests/mhash_003.phpt
index 38d1a8b5f05e1f6bc3bdcb06912af6f6c5a8b688..a4d43eb8d5306b1e300173b53a6fb5af71c770e4 100644 (file)
--- a/ext/hash/tests/mhash_003.phpt
+++ b/ext/hash/tests/mhash_003.phpt
@@ -1,9 +1,7 @@
 --TEST--
-mhash_keygen_s2k() test
+MHash: mhash_keygen_s2k() test
 --SKIPIF--
-<?php
-       include "skip_mhash.inc";
-?>
+<?php if(!function_exists('mhash')) { die('skip mhash compatibility layer not available'); } ?>
 --FILE--
 <?php
 

diff --git a/ext/hash/tests/mhash_004.phpt b/ext/hash/tests/mhash_004.phpt
index b928a794b1ec099c8b7afd8e01caaadae8228616..f3c5e34ee3882a2d5d81c4b4af23da0fff2b93f9 100644 (file)
--- a/ext/hash/tests/mhash_004.phpt
+++ b/ext/hash/tests/mhash_004.phpt
@@ -1,9 +1,7 @@
 --TEST--
-mhash() modifying algorithm parameter
+MHash: mhash() modifying algorithm parameter
 --SKIPIF--
-<?php
-       include "skip_mhash.inc";
-?>
+<?php if(!function_exists('mhash')) { die('skip mhash compatibility layer not available'); } ?>
 --FILE--
 <?php
 

diff --git a/ext/hash/tests/new-context.phpt b/ext/hash/tests/new-context.phpt
index b4ddf64a0f919b4032a6012055542cb66b3b7f89..b8ada08357c5de3208d94e7ce7affa1014f808fa 100644 (file)
--- a/ext/hash/tests/new-context.phpt
+++ b/ext/hash/tests/new-context.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Attempt to instantiate a HashContext directly
+Hash: Attempt to instantiate a HashContext directly
 --SKIPIF--
 <?php if (!extension_loaded('hash')) echo 'skip';
 --FILE--

diff --git a/ext/hash/tests/reuse.phpt b/ext/hash/tests/reuse.phpt
index 481a6cfe0f58c7c43bcbccdf5eca523e2c793fd3..2955aac2c8a0b3fa53e2ff5ca8e7f2d4bca6966b 100644 (file)
--- a/ext/hash/tests/reuse.phpt
+++ b/ext/hash/tests/reuse.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Attempt to reuse a closed hash context
+Hash: Attempt to reuse a closed hash context
 --SKIPIF--
 <?php if (!extension_loaded('hash')) echo 'skip';
 --FILE--

diff --git a/ext/hash/tests/ripemd128.phpt b/ext/hash/tests/ripemd128.phpt
index e7473e316cab264b2b7673fa3719511f826b52a4..e896d35be01ac27cff243ebde92b128b3fd09d1b 100644 (file)
--- a/ext/hash/tests/ripemd128.phpt
+++ b/ext/hash/tests/ripemd128.phpt
@@ -1,7 +1,5 @@
 --TEST--
-ripemd128 algorithm
---SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
+Hash: ripemd128 algorithm
 --FILE--
 <?php
 echo hash('ripemd128', '') . "\n";

diff --git a/ext/hash/tests/ripemd160.phpt b/ext/hash/tests/ripemd160.phpt
index 8fe7b05296a64f5d567fcd9f75ca40cfd1474806..40dd82db299f6ef7ca1ba03c493c1953b3a22776 100644 (file)
--- a/ext/hash/tests/ripemd160.phpt
+++ b/ext/hash/tests/ripemd160.phpt
@@ -1,7 +1,5 @@
 --TEST--
-ripemd160 algorithm
---SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
+Hash: ripemd160 algorithm
 --FILE--
 <?php
 echo hash('ripemd160', '') . "\n";

diff --git a/ext/hash/tests/ripemd256.phpt b/ext/hash/tests/ripemd256.phpt
index 6fc23794a5df2359971864f4c57affc55589eda5..92b516018629d5012c09bfb618fddf87271f6e1d 100644 (file)
--- a/ext/hash/tests/ripemd256.phpt
+++ b/ext/hash/tests/ripemd256.phpt
@@ -1,7 +1,5 @@
 --TEST--
-ripemd256 algorithm
---SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
+Hash: ripemd256 algorithm
 --FILE--
 <?php
 echo hash('ripemd256', '') . "\n";

diff --git a/ext/hash/tests/ripemd320.phpt b/ext/hash/tests/ripemd320.phpt
index 152c922d5d9320d73054c2c0b55d413031bb8410..37930a4a0cf0ae81d253b01cced0fc7581b6d096 100644 (file)
--- a/ext/hash/tests/ripemd320.phpt
+++ b/ext/hash/tests/ripemd320.phpt
@@ -1,7 +1,5 @@
 --TEST--
-ripemd320 algorithm
---SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
+Hash: ripemd320 algorithm
 --FILE--
 <?php
 echo hash('ripemd320', '') . "\n";

diff --git a/ext/hash/tests/serialize-context.phpt b/ext/hash/tests/serialize-context.phpt
index 78177cda501d50b6383f652b04e55d572cfcde78..32aa0ab806072ddf61376b050037e7d31abc0169 100644 (file)
--- a/ext/hash/tests/serialize-context.phpt
+++ b/ext/hash/tests/serialize-context.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Serialize a context
---SKIPIF--
-<?php if (!extension_loaded('hash')) echo 'skip';
+Hash: Context serialization
 --FILE--
 <?php
 
@@ -12,4 +10,4 @@ try {
   echo "Exception: {$e->getMessage()}\n";
 }
 --EXPECT--
-Exception: Serialization of 'HashContext' is not allowed
\ No newline at end of file
+Exception: Serialization of 'HashContext' is not allowed

diff --git a/ext/hash/tests/sha1.phpt b/ext/hash/tests/sha1.phpt
index b19378165331b860c99b5235845716ed1af40649..82a97037343431e1a77f733479e49db2e4def1ec 100644 (file)
--- a/ext/hash/tests/sha1.phpt
+++ b/ext/hash/tests/sha1.phpt
@@ -1,7 +1,5 @@
 --TEST--
-sha1 algorithm
---SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
+Hash: sha1 algorithm
 --FILE--
 <?php
 echo hash('sha1', '') . "\n";

diff --git a/ext/hash/tests/sha224.phpt b/ext/hash/tests/sha224.phpt
index ab2bd6d55f8bac39f6a74e3302a1db86f1c885f4..468e272fee2aedc6481c7dbc3d687b317af5df28 100644 (file)
--- a/ext/hash/tests/sha224.phpt
+++ b/ext/hash/tests/sha224.phpt
@@ -1,7 +1,5 @@
 --TEST--
-sha224 algorithm
---SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
+Hash: sha224 algorithm
 --FILE--
 <?php
 echo hash('sha224', '') . "\n";

diff --git a/ext/hash/tests/sha256.phpt b/ext/hash/tests/sha256.phpt
index 04b1c11abd314b0e67dd15757953a4beeff2e0ce..cf3f4069fd29033d9625086117ae3469a44f0193 100644 (file)
--- a/ext/hash/tests/sha256.phpt
+++ b/ext/hash/tests/sha256.phpt
@@ -1,7 +1,5 @@
 --TEST--
-sha256 algorithm
---SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
+Hash: sha256 algorithm
 --FILE--
 <?php
 echo hash('sha256', '') . "\n";

diff --git a/ext/hash/tests/sha3.phpt b/ext/hash/tests/sha3.phpt
index 67fb22f988899052053b135a5b93b97190bb8220..0ba6af9c3eafac53cd70d19853aeadb26fdfde90 100644 (file)
--- a/ext/hash/tests/sha3.phpt
+++ b/ext/hash/tests/sha3.phpt
@@ -1,7 +1,5 @@
 --TEST--
-sha3 algorithm
---SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
+Hash: sha3 algorithm
 --FILE--
 <?php
 

diff --git a/ext/hash/tests/sha384.phpt b/ext/hash/tests/sha384.phpt
index e5be2ab2747f56fa71f5d0ece5bbce33eadb60a0..03b873c079f0f861149d7e152f0e8ed99f2c9e49 100644 (file)
--- a/ext/hash/tests/sha384.phpt
+++ b/ext/hash/tests/sha384.phpt
@@ -1,7 +1,5 @@
 --TEST--
-sha384 algorithm
---SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
+Hash: sha384 algorithm
 --FILE--
 <?php
 echo hash('sha384', '') . "\n";

diff --git a/ext/hash/tests/sha512-224.phpt b/ext/hash/tests/sha512-224.phpt
index 3769832ee6d589b708f5b096df32e084ac3a3570..6a3ae32c8e7e82b69e00fb3da13f037d440f8696 100644 (file)
--- a/ext/hash/tests/sha512-224.phpt
+++ b/ext/hash/tests/sha512-224.phpt
@@ -1,7 +1,5 @@
 --TEST--
-sha512/224 algorithm
---SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
+Hash: sha512/224 algorithm
 --FILE--
 <?php
 echo hash('sha512/224', '') . "\n";

diff --git a/ext/hash/tests/sha512-256.phpt b/ext/hash/tests/sha512-256.phpt
index 33ae5f177093d1e4e082ab49adf1efb0e5ff6ddd..3bcfd34254fa45fdb99b8c158b4ee303edf2cbeb 100644 (file)
--- a/ext/hash/tests/sha512-256.phpt
+++ b/ext/hash/tests/sha512-256.phpt
@@ -1,7 +1,5 @@
 --TEST--
-sha512/256 algorithm
---SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
+Hash: sha512/256 algorithm
 --FILE--
 <?php
 echo hash('sha512/256', '') . "\n";

diff --git a/ext/hash/tests/sha512.phpt b/ext/hash/tests/sha512.phpt
index 93fbb20d635a4751fac8b657641366392e7ad159..1fa420b143f7f7c20505c9458a8e68ad1db81e60 100644 (file)
--- a/ext/hash/tests/sha512.phpt
+++ b/ext/hash/tests/sha512.phpt
@@ -1,7 +1,5 @@
 --TEST--
-sha512 algorithm
---SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
+Hash: sha512 algorithm
 --FILE--
 <?php
 echo hash('sha512', '') . "\n";

diff --git a/ext/hash/tests/skip_mhash.inc b/ext/hash/tests/skip_mhash.inc
deleted file mode 100644 (file)
index 608b557..0000000
--- a/ext/hash/tests/skip_mhash.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-if (!function_exists("mhash")) {
-       die("skip mhash extension is not available");
-}
-?>

diff --git a/ext/hash/tests/snefru.phpt b/ext/hash/tests/snefru.phpt
index 1b0dfa70fe1540b323217a6745fcf542d2b00bbd..3d4694e6bab5265cc2402291879fd730c9fbf111 100644 (file)
--- a/ext/hash/tests/snefru.phpt
+++ b/ext/hash/tests/snefru.phpt
@@ -1,7 +1,5 @@
 --TEST--
-snefru
---SKIPIF--
-<?php extension_loaded('hash') or die('skip'); ?>
+Hash: snefru algorithm
 --FILE--
 <?php
 echo hash('snefru', ''), "\n";

diff --git a/ext/hash/tests/tiger.phpt b/ext/hash/tests/tiger.phpt
index 468fc8f6990083d1cf90164753c3d995c3706803..609e96f76947db9dde09261ba0c84d151cd146b4 100644 (file)
--- a/ext/hash/tests/tiger.phpt
+++ b/ext/hash/tests/tiger.phpt
@@ -1,7 +1,5 @@
 --TEST--
-tiger
---SKIPIF--
-<?php extension_loaded('hash') or die('skip'); ?>
+Hash: tiger algorithm
 --FILE--
 <?php
 echo hash('tiger192,3', ''),"\n";

diff --git a/ext/hash/tests/whirlpool.phpt b/ext/hash/tests/whirlpool.phpt
index 5f9dd164debb6b0c2bbd8070a7b3ecdb7f1e89f8..267bc8084b96f06aec1d7a22b7cf38b42058d36b 100644 (file)
--- a/ext/hash/tests/whirlpool.phpt
+++ b/ext/hash/tests/whirlpool.phpt
@@ -1,7 +1,5 @@
 --TEST--
-whirlpool
---SKIPIF--
-<?php extension_loaded('hash') or die('skip'); ?>
+Hash: whirlpool algorithm
 --FILE--
 <?php
 echo hash('whirlpool', ''), "\n";