Replace fakemail with minimal PHP script

diff --git a/.gitignore b/.gitignore
index 39f001a67e248ab0edede640c0c5d55ceb06c9fd..587f4abc42593c96e70cd485591673647ba263b5 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -213,8 +213,6 @@ php
 /main/config.w32.h
 /win32/build/deplister.exe
 /win32/build/deplister.obj
-/win32/build/fakemail.exe
-/win32/build/fakemail.obj
 /win32/*.aps
 /win32/*.positions
 /win32/*.suo

diff --git a/run-tests.php b/run-tests.php
index 8ea737e1e4ad07df737edaa926c51fdb96f526cb..1a1d2e9c538364370559849317716c91a176c0c9 100755 (executable)
--- a/run-tests.php
+++ b/run-tests.php
@@ -2110,7 +2110,7 @@ TEST $file
                $section_text['INI'] = str_replace('{PWD}', dirname($file), $section_text['INI']);
                $section_text['INI'] = str_replace('{TMP}', sys_get_temp_dir(), $section_text['INI']);
                if (PHP_OS_FAMILY === 'Windows') {
-                       $replacement = 'fakemail $1';
+                       $replacement = '"' . PHP_BINARY . ' -r \"while ($in = fgets(STDIN)) echo $in;\" > $1"';
                } else {
                        $replacement = 'tee $1 >/dev/null';
                }

diff --git a/win32/build/Makefile b/win32/build/Makefile
index 6df5b966e31c9edde53dddf0a161889b294bdf8e..a6b54c07ff3d9b52ee1ec783fb774c576fae884c 100644 (file)
--- a/win32/build/Makefile
+++ b/win32/build/Makefile
@@ -203,7 +203,7 @@ build-snap: set-tmp-env generated_files
        -for %T in ($(EXT_TARGETS)) do $(MAKE) /I /nologo "%T"
        -for %T in ($(PECL_TARGETS)) do $(MAKE) /I /nologo "%T"
 
-build-dist: $(BUILD_DIR)\deplister.exe $(BUILD_DIR)\fakemail.exe
+build-dist: $(BUILD_DIR)\deplister.exe
        -rd /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
        -rd /s /q $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)
        -del /f /q $(BUILD_DIR)\$(DIST_ZIP_SNAP)
@@ -227,9 +227,6 @@ snap: build-snap build-devel build-dist
 $(BUILD_DIR)\deplister.exe:    win32\build\deplister.c
        $(CC) /nologo /Fo$(BUILD_DIR)\ /Fd$(BUILD_DIR)\ /Fp$(BUILD_DIR)\ /FR$(BUILD_DIR) /Fe$(BUILD_DIR)\deplister.exe win32\build\deplister.c imagehlp.lib
 
-$(BUILD_DIR)\fakemail.exe:     win32\build\fakemail.c
-       $(CC) /nologo /Fo$(BUILD_DIR)\ /Fd$(BUILD_DIR)\ /Fp$(BUILD_DIR)\ /FR$(BUILD_DIR) /Fe$(BUILD_DIR)\fakemail.exe win32\build\fakemail.c
-
 install: really-install install-sdk
 
 build-lib: build-ext-libs

diff --git a/win32/build/fakemail.c b/win32/build/fakemail.c
deleted file mode 100644 (file)
index 6a24c47..0000000
--- a/win32/build/fakemail.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-  +----------------------------------------------------------------------+
-  | Copyright (c) The PHP Group                                          |
-  +----------------------------------------------------------------------+
-  | This source file is subject to version 3.01 of the PHP license,      |
-  | that is bundled with this package in the file LICENSE, and is        |
-  | available through the world-wide-web at the following url:           |
-  | http://www.php.net/license/3_01.txt                                  |
-  | If you did not receive a copy of the PHP license and are unable to   |
-  | obtain it through the world-wide-web, please send a note to          |
-  | license@php.net so we can mail you a copy immediately.               |
-  +----------------------------------------------------------------------+
-  | Author: Christoph M. Becker <cmb@php.net>                            |
-  +----------------------------------------------------------------------+
-*/
-
-/* This program can be used as sendmail replacement to write the email contents
-   to a file, which is mainly useful for email related tests on Windows. 
-   Usage: fakemail <path> */
-
-#include <stdio.h>
-
-int main(int argc, char *argv[])
-{
-    FILE *out;
-    char c;
-
-    if (argc != 2) {
-        return 1;
-    }
-    if (!(out = fopen(argv[1], "w"))) {
-        return 1;
-    }
-    while ((c = getchar()) != EOF) {
-        putc(c, out);
-    }
-    fclose(out);
-
-    return 0;
-}

diff --git a/win32/build/mkdist.php b/win32/build/mkdist.php
index 0995c8f7cfe978adecf39a6c92020b38eda397bf..f4155308af93dc1bcfe154e9664baf3092697d03 100644 (file)
--- a/win32/build/mkdist.php
+++ b/win32/build/mkdist.php
@@ -497,7 +497,6 @@ foreach ($dirs as $dir) {
        copy_test_dir($dir, $test_dir);
 }
 copy('run-tests.php', $test_dir . '/run-test.php');
-copy($build_dir . '/fakemail.exe', $test_dir . '/fakemail.exe');
 
 /* change this next line to true to use good-old
  * hand-assembled go-pear-bundle from the snapshot template */