Minor Win32 fixes.

This commit is contained in:
Erik de Castro Lopo 2004-05-10 11:07:34 +00:00
parent 1e3b1a72e4
commit 0068f45217
4 changed files with 44 additions and 17 deletions

View File

@ -1,3 +1,9 @@
2004-05-10 Erik de Castro Lopo <erikd AT mega-nerd DOT com>
* tests/pipe_test.tpl tests/stdio_test.c Win32/Makefile.msvc
Make sure these programs compile (even though they do nothing) on Win32
and add them to the "make check" target.
2004-05-09 Erik de Castro Lopo <erikd AT mega-nerd DOT com>
* src/file_io.c

View File

@ -126,6 +126,8 @@ TEST_PROGS= \
".\tests\misc_test.exe" \
".\tests\string_test.exe" \
".\tests\win32_test.exe" \
".\tests\stdio_test.exe" \
".\tests\pipe_test.exe" \
".\tests\benchmark.exe"
CHECK: $(TEST_PROGS)
@ -252,6 +254,12 @@ CHECK: $(TEST_PROGS)
-@".\tests\sfversion.exe"
-@echo " passed tests on AVR files."
-@echo ----------------------------------------------------------------------
-@".\tests\stdio_test.exe"
-@".\tests\pipe_test.exe"
-@echo ----------------------------------------------------------------------
-@".\tests\sfversion.exe"
-@echo " passed all tests."
-@echo ----------------------------------------------------------------------
#====================================================================
# C files in src\GSM610.
@ -521,21 +529,21 @@ CHECK: $(TEST_PROGS)
$(CPP) $(CFLAGS) /Fo".\tests\win32_test.obj" /c ".\tests\win32_test.c"
$(LINK32) $(PROG_LINK_FLAGS) /out:".\tests\win32_test.exe" ".\tests\win32_test.obj"
# ".\tests\stdio_test.exe" : ".\tests\stdio_test.c" ".\tests\utils.obj"
# $(CPP) $(CFLAGS) /Fo".\tests\stdio_test.obj" /c ".\tests\stdio_test.c"
# $(LINK32) $(PROG_LINK_FLAGS) /out:".\tests\stdio_test.exe" ".\tests\stdio_test.obj" ".\tests\utils.obj" libsndfile.lib
#
# ".\tests\stdin_test.exe" : ".\tests\stdin_test.c" ".\tests\utils.obj"
# $(CPP) $(CFLAGS) /Fo".\tests\stdin_test.obj" /c ".\tests\stdin_test.c"
# $(LINK32) $(PROG_LINK_FLAGS) /out:".\tests\stdin_test.exe" ".\tests\stdin_test.obj" ".\tests\utils.obj" libsndfile.lib
#
# ".\tests\stdout_test.exe" : ".\tests\stdout_test.c" ".\tests\utils.obj"
# $(CPP) $(CFLAGS) /Fo".\tests\stdout_test.obj" /c ".\tests\stdout_test.c"
# $(LINK32) $(PROG_LINK_FLAGS) /out:".\tests\stdout_test.exe" ".\tests\stdout_test.obj" ".\tests\utils.obj" libsndfile.lib
#
# ".\tests\pipe_test.exe" : ".\tests\pipe_test.c" ".\tests\utils.obj"
# $(CPP) $(CFLAGS) /Fo".\tests\pipe_test.obj" /c ".\tests\pipe_test.c"
# $(LINK32) $(PROG_LINK_FLAGS) /out:".\tests\pipe_test.exe" ".\tests\pipe_test.obj" ".\tests\utils.obj" libsndfile.lib
".\tests\stdio_test.exe" : ".\tests\stdio_test.c" ".\tests\utils.obj"
$(CPP) $(CFLAGS) /Fo".\tests\stdio_test.obj" /c ".\tests\stdio_test.c"
$(LINK32) $(PROG_LINK_FLAGS) /out:".\tests\stdio_test.exe" ".\tests\stdio_test.obj" ".\tests\utils.obj" libsndfile.lib
".\tests\pipe_test.exe" : ".\tests\pipe_test.c" ".\tests\utils.obj"
$(CPP) $(CFLAGS) /Fo".\tests\pipe_test.obj" /c ".\tests\pipe_test.c"
$(LINK32) $(PROG_LINK_FLAGS) /out:".\tests\pipe_test.exe" ".\tests\pipe_test.obj" ".\tests\utils.obj" libsndfile.lib
# ".\tests\stdin_test.exe" : ".\tests\stdin_test.c" ".\tests\utils.obj"
# $(CPP) $(CFLAGS) /Fo".\tests\stdin_test.obj" /c ".\tests\stdin_test.c"
# $(LINK32) $(PROG_LINK_FLAGS) /out:".\tests\stdin_test.exe" ".\tests\stdin_test.obj" ".\tests\utils.obj" libsndfile.lib
#
# ".\tests\stdout_test.exe" : ".\tests\stdout_test.c" ".\tests\utils.obj"
# $(CPP) $(CFLAGS) /Fo".\tests\stdout_test.obj" /c ".\tests\stdout_test.c"
# $(LINK32) $(PROG_LINK_FLAGS) /out:".\tests\stdout_test.exe" ".\tests\stdout_test.obj" ".\tests\utils.obj" libsndfile.lib
".\tests\benchmark.exe" : ".\tests\benchmark.c"
$(CPP) $(CFLAGS) /Fo".\tests\benchmark.obj" /c ".\tests\benchmark.c"

View File

@ -32,8 +32,7 @@
int
main (void)
{
puts ("This test doesn't work on win32.") ;
puts (" pipe_test : this test doesn't work on win32.") ;
return 0 ;
} /* main */

View File

@ -40,6 +40,17 @@
#include "utils.h"
#if (OS_IS_WIN32)
int
main (void)
{
puts (" stdio_test : this test doesn't work on win32.") ;
return 0 ;
} /* main */
#else
#ifndef WIFEXITED
#define WIFEXITED(s) (((s) & 0xff) == 0)
#endif
@ -136,6 +147,9 @@ file_exists (const char *filename)
return 1 ;
} /* file_exists */
#endif
/*
** Do not edit or modify anything in this comment block.
** The arch-tag line is a file identity tag for the GNU Arch