X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=tests%2Fmakefile.msc.in;h=f87c58f71d7583822b64c419ed137fa2563812a1;hb=2a677d1370a1983c2c5e1a4a6dd5f0d9fa9868b3;hp=83a74a24b8232c3beda771719483e521ceb93b6e;hpb=847d8e921273f134bcf560023c14cd5f8eaeea00;p=platform%2Fupstream%2Fglib.git

diff --git a/tests/makefile.msc.in b/tests/makefile.msc.in
index 83a74a2..f87c58f 100644
--- a/tests/makefile.msc.in
+++ b/tests/makefile.msc.in
@@ -3,64 +3,103 @@
 
 TOP = ..\..
 
-!INCLUDE $(TOP)\build\win32\make.msc
-
-# Possibly override GLib version in build\win32\module.defs
-GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
+!INCLUDE ..\build\win32\make.msc
 
 ################################################################
 
-# Nothing much configurable below
+INCLUDES = -FImsvc_recommended_pragmas.h -I .. -I ..\glib -I ..\gmodule
+DEFINES = -DHAVE_CONFIG_H -DENABLE_REGEX
 
-INCLUDES = -I .. -I ..\glib -I ..\gmodule
-DEFINES = -DHAVE_CONFIG_H
+NONAUTOMATIC_TESTS = \
+	testglib.exe	\
+	testgdate.exe	\
+	testgdateparser.exe \
+	unicode-normalize.exe \
+	unicode-collate.exe
 
 TESTS = \
-	testglib.exe \
-	testgdate.exe \
-	testgdateparser.exe \
-	array-test.exe	\
+	atomic-test.exe \
+	asyncqueue-test.exe \
+	base64-test.exe \
+	bit-test.exe \
+	bookmarkfile-test.exe \
+	child-test.exe \
+	checksum-test.exe \
+	completion-test.exe \
+	convert-test.exe \
 	date-test.exe	\
-	dirname-test.exe\
+	dirname-test.exe \
+	env-test.exe \
+	errorcheck-mutex-test.exe \
+	file-test.exe \
 	gio-test.exe	\
+	iochannel-test.exe \
 	hash-test.exe	\
 	list-test.exe	\
-	mainloop-test.exe\
+	mainloop-test.exe \
+	mapping-test.exe \
+#c99	markup-collect.exe \
+	markup-escape-test.exe \
 	markup-test.exe	\
+#main?	memchunks.exe \
 	module-test.exe	\
 	node-test.exe	\
+#c99	onceinit.exe \
+	patterntest.exe \
 	queue-test.exe	\
-	rand-test.exe	\
-	relation-test.exe\
+	qsort-test.exe \
+	regex-test.exe \
+	relation-test.exe \
+	scannerapi.exe \
+	sequence-test.exe \
 	shell-test.exe	\
+	slice-color.exe \
+#unistd	slice-concurrent.exe\
+	slice-threadinit.exe \
+	slice-test.exe	\
 	slist-test.exe	\
 	spawn-test.exe	\
-# strfunc-test doesn't compile with MSVC
-#	strfunc-test.exe\
-	string-test.exe	\
+	testingbase64.exe \
 	thread-test.exe	\
-	threadpool-test.exe\
+	threadpool-test.exe \
+#unistd	timeloop-basic.exe \
+#unistd	timeloop-closure.exe \
+#unistd	timeloop.exe \
 	tree-test.exe	\
 	type-test.exe	\
+	unicode-caseconv.exe \
 	unicode-encoding.exe \
+	utf8-validate.exe \
+	utf8-pointer.exe \
+	uri-test.exe \
+	\
+	gio-ls.exe
+
+DLLS = \
 	libmoduletestplugin_a.dll \
 	libmoduletestplugin_b.dll
 
-all :	$(TESTS)
-
-makefile.msc: makefile.msc.in
-	$(SED) -e s,@GLIB[_]MAJOR_VERSION@,@GLIB_MAJOR_VERSION@, \
-	       -e s,@GLIB[_]MINOR_VERSION@,@GLIB_MINOR_VERSION@, <makefile.msc.in >$@
+all :	$(TESTS) $(NONAUTOMATIC_TESTS) $(DLLS)
 
 .c.exe :
 	$(CC) $(CFLAGS) -c $<
-	$(CC) $(CFLAGS) -Fe$@ $< ..\glib\glib-$(GLIB_VER).lib ..\gmodule\gmodule-$(GLIB_VER).lib ..\gthread\gthread-$(GLIB_VER).lib $(LDFLAGS) user32.lib /subsystem:console
+	$(CC) $(CFLAGS) -Fe$@ $< ..\glib\glib-2.0.lib ..\gmodule\gmodule-2.0.lib ..\gthread\gthread-2.0.lib $(LDFLAGS) user32.lib /subsystem:console
+
+gio-ls.exe : gio-ls.obj
+	$(CC) $(CFLAGS) -Fe$@ gio-ls.obj \
+	..\glib\glib-2.0.lib ..\gmodule\gmodule-2.0.lib ..\gthread\gthread-2.0.lib \
+	..\gobject\gobject-2.0.lib ..\gio\gio-2.0.lib \
+	$(LDFLAGS) user32.lib /subsystem:console
 
+slice-test.exe : memchunks.obj slice-test.obj 
+	$(CC) $(CFLAGS) -Fe$@ memchunks.obj slice-test.obj \
+	..\glib\glib-2.0.lib ..\gmodule\gmodule-2.0.lib ..\gthread\gthread-2.0.lib $(LDFLAGS) user32.lib /subsystem:console
+	
 libmoduletestplugin_a.dll : libmoduletestplugin_a.obj
-	$(CC) $(CFLAGS) -LD libmoduletestplugin_a.obj ..\gmodule\gmodule-$(GLIB_VER).lib ..\glib\glib-$(GLIB_VER).lib $(LDFLAGS)
+	$(CC) $(CFLAGS) -LD libmoduletestplugin_a.obj ..\gmodule\gmodule-2.0.lib ..\glib\glib-2.0.lib $(LDFLAGS)
 
 libmoduletestplugin_b.dll : libmoduletestplugin_b.obj
-	$(CC) $(CFLAGS) -LD libmoduletestplugin_b.obj ..\gmodule\gmodule-$(GLIB_VER).lib ..\glib\glib-$(GLIB_VER).lib $(LDFLAGS)
+	$(CC) $(CFLAGS) -LD libmoduletestplugin_b.obj ..\gmodule\gmodule-2.0.lib ..\glib\glib-2.0.lib $(LDFLAGS)
 
 check:	all
-	for %p in ($(TESTS)) do %p
+	for %p in ($(TESTS)) do set PATH=..\glib;..\gmodule;..\gobject;..\gthread;%PATH% && %p