diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-06-17 01:03:20 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-06-17 01:06:20 -0700 |
| commit | af5e2eaf8d1ea57e5961993553170ee00268fe26 (patch) | |
| tree | 938f83337bcf8209e8e88334dd13bbd92db5d361 /ext/bz2 | |
| parent | a080611e484aa56e3be6ab038221ab3304c125b1 (diff) | |
| download | php-git-af5e2eaf8d1ea57e5961993553170ee00268fe26.tar.gz | |
Merge branch 'pull-request/320'
* pull-request/320:
this is test 5 not 6
fix race condition
more shared names that create race conditions
change to a unique filename
more shared filenames
yet another shared filename
don't share a filename to stop race conditions
fix race condition for 2-4 and normalize names for others
fix race condition when running tests in parallel
clean up after test
Fix #64572: Clean up after the test
Fix #64572: Clean up after the test
Diffstat (limited to 'ext/bz2')
| -rw-r--r-- | ext/bz2/tests/bug51997.phpt | 2 | ||||
| -rw-r--r-- | ext/bz2/tests/with_files.phpt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/bz2/tests/bug51997.phpt b/ext/bz2/tests/bug51997.phpt index fea5398947..c53deacc5f 100644 --- a/ext/bz2/tests/bug51997.phpt +++ b/ext/bz2/tests/bug51997.phpt @@ -7,7 +7,7 @@ Bug #51997 (SEEK_CUR with 0 value, returns a warning) error_reporting(E_ALL); -$filename = "testfile.bz2"; +$filename = "bug51997.bz2"; $str = "This is a test string.\n"; $bz = bzopen($filename, "w"); bzwrite($bz, $str); diff --git a/ext/bz2/tests/with_files.phpt b/ext/bz2/tests/with_files.phpt index 5691445939..3763398a14 100644 --- a/ext/bz2/tests/with_files.phpt +++ b/ext/bz2/tests/with_files.phpt @@ -7,7 +7,7 @@ BZ2 with files error_reporting(E_ALL); -$filename = "testfile.bz2"; +$filename = "with_files.bz2"; $str = "This is a test string.\n"; $bz = bzopen($filename, "w"); bzwrite($bz, $str); |