Index: ext/libicpf/src/libicpf-tests/libicpf-tests.cpp
===================================================================
diff -u -N -r607822e0b875d4357808668f88e9a57d1c6e5d65 -r1504b5e9af0cbbc688765c3530ee3443cb04fc01
--- ext/libicpf/src/libicpf-tests/libicpf-tests.cpp	(.../libicpf-tests.cpp)	(revision 607822e0b875d4357808668f88e9a57d1c6e5d65)
+++ ext/libicpf/src/libicpf-tests/libicpf-tests.cpp	(.../libicpf-tests.cpp)	(revision 1504b5e9af0cbbc688765c3530ee3443cb04fc01)
@@ -1,9 +1,33 @@
 // libicpf-tests.cpp : Defines the entry point for the console application.
 //
+#if defined(_WIN32) || defined(_WIN64)
+	#include <windows.h>
+#endif
 
+#include <conio.h>
+#include "gen_types.h"
+#include "config-test.h"
+#include "exception.h"
 
-int _tmain(int argc, _TCHAR* argv[])
+#if defined(_WIN32) || defined(_WIN64)
+int_t _tmain(int_t argc, tchar_t* argv[])
+#else
+int main(int argc, char_t* argv[])
+#endif
 {
+	ConfigTest ct;
+
+	try
+	{
+		ct.Run();
+	}
+	catch(icpf::exception& e)
+	{
+		tchar_t szData[4096];
+		e.get_info(szData, 4096);
+		_tprintf(TSTRFMT, szData);
+	}
+
+	_getch();
 	return 0;
 }
-