luo980/libuv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename test-runner to just runner

Browse Source 
And a minor fix to the VS solution.
This commit is contained in:
Bert Belder 2011-04-18 14:44:01 +02:00
parent c3eda7a4da
commit a3be5339e2
9 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -1,6 +1,6 @@
CFLAGS=-ansi -g -Wall CFLAGS=-ansi -g -Wall
LINKFLAGS=-g -lm LINKFLAGS=-g -lm
all: oio.a test/test-runner all: oio.a test/runner
TESTS=test/echo-server.c \ TESTS=test/echo-server.c \
test/test-pass-always.c \ test/test-pass-always.c \
@ -9,8 +9,8 @@ TESTS=test/echo-server.c \
test/test-callback-stack.c \ test/test-callback-stack.c \
test/test-timeout.c test/test-timeout.c
test/test-runner: test/*.h test/test-runner.c test/test-runner-unix.c $(TESTS) oio.a test/runner: test/*.h test/runner.c test/runner-unix.c $(TESTS) oio.a
$(CC) $(CFLAGS) $(LINKFLAGS) -o test/test-runner test/test-runner.c test/test-runner-unix.c $(TESTS) oio.a $(CC) $(CFLAGS) $(LINKFLAGS) -o test/runner test/runner.c test/runner-unix.c $(TESTS) oio.a
oio.a: oio-unix.o ev/ev.o oio.a: oio-unix.o ev/ev.o
$(AR) rcs oio.a oio-unix.o ev/ev.o $(AR) rcs oio.a oio-unix.o ev/ev.o
@ -30,11 +30,11 @@ ev/config.h:
.PHONY: clean distclean test .PHONY: clean distclean test
test: test/test-runner test: test/runner
test/test-runner test/runner
clean: clean:
$(RM) -f *.o *.a test/test-runner $(RM) -f *.o *.a test/runner
$(MAKE) -C ev clean $(MAKE) -C ev clean
distclean: distclean:

8
liboio-test.vcxproj
View File

@ -141,14 +141,14 @@
<ClCompile Include="test\test-fail-always.c" /> <ClCompile Include="test\test-fail-always.c" />
<ClCompile Include="test\test-pass-always.c" /> <ClCompile Include="test\test-pass-always.c" />
<ClCompile Include="test\test-ping-pong.c" /> <ClCompile Include="test\test-ping-pong.c" />
<ClCompile Include="test\test-runner-win32.c" /> <ClCompile Include="test\runner-win32.c" />
<ClCompile Include="test\test-runner.c" /> <ClCompile Include="test\runner.c" />
<ClCompile Include="test\test-timeout.c" /> <ClCompile Include="test\test-timeout.c" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="test\test-list.h" /> <ClInclude Include="test\test-list.h" />
<ClInclude Include="test\test-runner-win32.h" /> <ClInclude Include="test\runner-win32.h" />
<ClInclude Include="test\test-runner.h" /> <ClInclude Include="test\runner.h" />
<ClInclude Include="test\test.h" /> <ClInclude Include="test\test.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

8
liboio.vcxproj
View File

@ -57,19 +57,19 @@
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir> <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(Platform)\$(Configuration)</IntDir> <IntDir>$(Platform)\$(Configuration)\</IntDir>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir> <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(Platform)\$(Configuration)</IntDir> <IntDir>$(Platform)\$(Configuration)\</IntDir>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir> <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(Platform)\$(Configuration)</IntDir> <IntDir>$(Platform)\$(Configuration)\</IntDir>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir> <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(Platform)\$(Configuration)</IntDir> <IntDir>$(Platform)\$(Configuration)\</IntDir>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile> <ClCompile>

4
test/test-runner-unix.c → test/runner-unix.c
View File

@ -1,5 +1,5 @@
#include "test-runner-unix.h" #include "runner-unix.h"
#include "test-runner.h" #include "runner.h"
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>

0
test/test-runner-unix.h → test/runner-unix.h
View File

4
test/test-runner-win32.c → test/runner-win32.c
View File

@ -4,7 +4,7 @@
#include <windows.h> #include <windows.h>
#include "test.h" #include "test.h"
#include "test-runner.h" #include "runner.h"
int process_start(char *name, process_info_t *p) { int process_start(char *name, process_info_t *p) {
@ -104,7 +104,7 @@ int process_wait(process_info_t *vec, int n, int timeout) {
if (n == 0) if (n == 0)
return 0; return 0;
ASSERT(n <= MAXIMUM_WAIT_OBJECTS) ASSERT(n <= MAXIMUM_WAIT_OBJECTS);
for (i = 0; i < n; i++) for (i = 0; i < n; i++)
handles[i] = vec[i].process; handles[i] = vec[i].process;

0
test/test-runner-win32.h → test/runner-win32.h
View File

2
test/test-runner.c → test/runner.c
View File

@ -1,6 +1,6 @@
#include "test.h" #include "test.h"
#include "test-runner.h" #include "runner.h"
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>

4
test/test-runner.h → test/runner.h
View File

@ -37,9 +37,9 @@ typedef struct {
* Include platform-dependent definitions * Include platform-dependent definitions
*/ */
#ifdef _WIN32 #ifdef _WIN32
# include "test-runner-win32.h" # include "runner-win32.h"
#else #else
# include "test-runner-unix.h" # include "runner-unix.h"
#endif #endif