diff options
| author | Raphael Geissert <geissert@php.net> | 2010-03-11 05:49:50 +0000 |
|---|---|---|
| committer | Raphael Geissert <geissert@php.net> | 2010-03-11 05:49:50 +0000 |
| commit | cf711f6ee86d8a1e641e9f25aca07765281d2799 (patch) | |
| tree | 36a781a923fda09da5fff9a0a4698f57546399b8 | |
| parent | 51de55b6e6633661600c03b53b55fb361ba1b4d7 (diff) | |
| download | php-git-cf711f6ee86d8a1e641e9f25aca07765281d2799.tar.gz | |
Properly skip tests that require the bundled gd lib when the external is used
| -rw-r--r-- | ext/gd/tests/bug42434.phpt | 1 | ||||
| -rwxr-xr-x | ext/gd/tests/imageantialias_error1.phpt | 1 | ||||
| -rwxr-xr-x | ext/gd/tests/imageantialias_error2.phpt | 1 | ||||
| -rw-r--r-- | ext/gd/tests/imagelayereffect_basic.phpt | 2 | ||||
| -rw-r--r-- | ext/gd/tests/imagelayereffect_error1.phpt | 2 | ||||
| -rw-r--r-- | ext/gd/tests/imagelayereffect_error2.phpt | 2 | ||||
| -rw-r--r-- | ext/gd/tests/imagelayereffect_error3.phpt | 2 |
7 files changed, 7 insertions, 4 deletions
diff --git a/ext/gd/tests/bug42434.phpt b/ext/gd/tests/bug42434.phpt index cede1ac17f..bc0790ede4 100644 --- a/ext/gd/tests/bug42434.phpt +++ b/ext/gd/tests/bug42434.phpt @@ -5,6 +5,7 @@ Bug #42434 (ImageLine w/ antialias = 1px shorter) if (!extension_loaded('gd')) {
die('skip gd extension not available');
}
+if (!GD_BUNDLED) die("skip requires bundled GD library\n");
?>
--FILE--
<?php
diff --git a/ext/gd/tests/imageantialias_error1.phpt b/ext/gd/tests/imageantialias_error1.phpt index 53fe0cc66a..e9475e9571 100755 --- a/ext/gd/tests/imageantialias_error1.phpt +++ b/ext/gd/tests/imageantialias_error1.phpt @@ -6,6 +6,7 @@ Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com> --SKIPIF-- <?php if (!extension_loaded("gd")) die("skip GD not present"); +if (!GD_BUNDLED) die("skip requires bundled GD library\n"); ?> --FILE-- <?php diff --git a/ext/gd/tests/imageantialias_error2.phpt b/ext/gd/tests/imageantialias_error2.phpt index 8dad8bd115..64b0a60eba 100755 --- a/ext/gd/tests/imageantialias_error2.phpt +++ b/ext/gd/tests/imageantialias_error2.phpt @@ -6,6 +6,7 @@ Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com> --SKIPIF-- <?php if (!extension_loaded("gd")) die("skip GD not present"); +if (!GD_BUNDLED) die("skip requires bundled GD library\n"); ?> --FILE-- <?php diff --git a/ext/gd/tests/imagelayereffect_basic.phpt b/ext/gd/tests/imagelayereffect_basic.phpt index 6dbc8600c6..a34e05e02f 100644 --- a/ext/gd/tests/imagelayereffect_basic.phpt +++ b/ext/gd/tests/imagelayereffect_basic.phpt @@ -6,7 +6,7 @@ Rafael Dohms <rdohms [at] gmail [dot] com> --SKIPIF-- <?php if (!extension_loaded("gd")) die("skip GD not present"); - if (!GD_BUNDLED) die('function only available in bundled, external GD detected'); + if (!GD_BUNDLED) die('skip function only available in bundled, external GD detected'); ?> --FILE-- <?php diff --git a/ext/gd/tests/imagelayereffect_error1.phpt b/ext/gd/tests/imagelayereffect_error1.phpt index ad457103cf..21f37a8a1e 100644 --- a/ext/gd/tests/imagelayereffect_error1.phpt +++ b/ext/gd/tests/imagelayereffect_error1.phpt @@ -6,7 +6,7 @@ Rafael Dohms <rdohms [at] gmail [dot] com> --SKIPIF-- <?php if (!extension_loaded("gd")) die("skip GD not present"); - if (!GD_BUNDLED) die('function only available in bundled, external GD detected'); + if (!GD_BUNDLED) die('skip function only available in bundled, external GD detected'); ?> --FILE-- <?php diff --git a/ext/gd/tests/imagelayereffect_error2.phpt b/ext/gd/tests/imagelayereffect_error2.phpt index 7fb993969d..d8d331bfdc 100644 --- a/ext/gd/tests/imagelayereffect_error2.phpt +++ b/ext/gd/tests/imagelayereffect_error2.phpt @@ -6,7 +6,7 @@ Rafael Dohms <rdohms [at] gmail [dot] com> --SKIPIF-- <?php if (!extension_loaded("gd")) die("skip GD not present"); - if (!GD_BUNDLED) die('function only available in bundled, external GD detected'); + if (!GD_BUNDLED) die('skip function only available in bundled, external GD detected'); ?> --FILE-- <?php diff --git a/ext/gd/tests/imagelayereffect_error3.phpt b/ext/gd/tests/imagelayereffect_error3.phpt index 9f99186333..d4deff1076 100644 --- a/ext/gd/tests/imagelayereffect_error3.phpt +++ b/ext/gd/tests/imagelayereffect_error3.phpt @@ -6,7 +6,7 @@ Rafael Dohms <rdohms [at] gmail [dot] com> --SKIPIF-- <?php if (!extension_loaded("gd")) die("skip GD not present"); - if (!GD_BUNDLED) die('function only available in bundled, external GD detected'); + if (!GD_BUNDLED) die('skip function only available in bundled, external GD detected'); ?> --FILE-- <?php |