make necko tests work on the trunk

netwerk/test/Makefile.in

@@ -84,8 +84,11 @@ LIBS		= $(EXTRA_DSO_LIBS) \
 		  $(MOZ_JS_LIBS) \
 		  $(XPCOM_LIBS) \
 		  $(NSPR_LIBS) \
+		  $(TK_LIBS) \
 		  $(NULL)
 
+DEFINES += $(TK_CFLAGS)
+
 include $(topsrcdir)/config/rules.mk
 
 _RES_FILES 	= urlparse.dat \

netwerk/test/PropertiesTest.cpp

@@ -36,6 +36,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+#include "TestCommon.h"
 #include "nsXPCOM.h"
 #include "nsString.h"
 #include "nsIEventQueueService.h"
@@ -63,6 +64,9 @@ static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
 int
 main(int argc, char* argv[])
 {
+  if (test_common_init(&argc, &argv) != 0)
+    return -1;
+
   nsresult ret;
 
 

netwerk/test/TestBlockingSocket.cpp

@@ -35,6 +35,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+#include "TestCommon.h"
 #include "nsIComponentRegistrar.h"
 #include "nsISocketTransportService.h"
 #include "nsISocketTransport.h"
@@ -120,6 +121,9 @@ RunBlockingTest(const nsACString &host, PRInt32 port, nsIFile *file)
 int
 main(int argc, char* argv[])
 {
+    if (test_common_init(&argc, &argv) != 0)
+        return -1;
+
     nsresult rv;
 
     if (argc < 4) {

netwerk/test/TestCallbacks.cpp

@@ -35,6 +35,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+#include "TestCommon.h"
 #include <stdio.h>
 #ifdef WIN32 
 #include <windows.h>
@@ -240,6 +241,9 @@ Consumer::Validate(nsIRequest* request, nsISupports *aContext) {
 nsresult StartLoad(const char *);
 
 int main(int argc, char *argv[]) {
+    if (test_common_init(&argc, &argv) != 0)
+        return -1;
+
     nsresult rv = NS_OK;
     PRBool cmdLineURL = PR_FALSE;
 

netwerk/test/TestCookie.cpp

@@ -36,6 +36,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+#include "TestCommon.h"
 #include "nsIServiceManager.h"
 #include "nsICookieService.h"
 #include <stdio.h>
@@ -168,6 +169,9 @@ InitPrefs(nsIPrefBranch *aPrefBranch)
 int
 main(PRInt32 argc, char *argv[])
 {
+    if (test_common_init(&argc, &argv) != 0)
+        return -1;
+
     nsresult rv0 = NS_InitXPCOM2(nsnull, nsnull, nsnull);
     if (NS_FAILED(rv0)) return -1;
 

netwerk/test/TestDNS.cpp

@@ -34,6 +34,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+#include "TestCommon.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include "nsIServiceManager.h"
@@ -88,6 +89,9 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(myDNSListener, nsIDNSListener)
 
 int main(int argc, char **argv)
 {
+    if (test_common_init(&argc, &argv) != 0)
+        return -1;
+
     int sleepLen = 10; // default: 10 seconds
 
     if (argc == 1) {

netwerk/test/TestIDN.cpp

@@ -37,6 +37,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+#include "TestCommon.h"
 #include <stdio.h>
 #include "nsIIDNService.h"
 #include "nsCOMPtr.h"
@@ -45,6 +46,9 @@
 #include "nsString.h"
 
 int main(int argc, char **argv) {
+    if (test_common_init(&argc, &argv) != 0)
+        return -1;
+
     // Test case from RFC 3492 (7.1 - Simplified Chinese)
     const char plain[] =
          "\xE4\xBB\x96\xE4\xBB\xAC\xE4\xB8\xBA\xE4\xBB\x80\xE4\xB9\x88\xE4\xB8\x8D\xE8\xAF\xB4\xE4\xB8\xAD\xE6\x96\x87";

netwerk/test/TestIOThreads.cpp

@@ -34,6 +34,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+#include "TestCommon.h"
 #include "nsIServiceManager.h"
 #include "nsIEventTarget.h"
 #include "nsCOMPtr.h"
@@ -77,8 +78,11 @@ static nsresult RunTest()
     return rv;
 }
 
-int main()
+int main(int argc, char **argv)
 {
+    if (test_common_init(&argc, &argv) != 0)
+        return -1;
+
     nsresult rv;
 
 #if defined(PR_LOGGING)

netwerk/test/TestOpen.cpp

@@ -36,6 +36,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+#include "TestCommon.h"
 #include "nsCOMPtr.h"
 #include "nsString.h"
 #include "nsIURI.h"
@@ -61,6 +62,9 @@
 int
 main(int argc, char **argv)
 {
+    if (test_common_init(&argc, &argv) != 0)
+        return -1;
+
     nsresult rv;
     char buf[256];
 

netwerk/test/TestPageLoad.cpp

@@ -35,6 +35,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+#include "TestCommon.h"
 #include "nsNetUtil.h"
 #include "nsIEventQueueService.h"
 #include "nsIServiceManager.h"
@@ -346,6 +347,9 @@ nsresult auxLoad(char *uriBuf)
 
 int main(int argc, char **argv)
 { 
+    if (test_common_init(&argc, &argv) != 0)
+        return -1;
+
     nsresult rv;
 
     if (argc == 1) {

netwerk/test/TestPerf.cpp

@@ -1,3 +1,4 @@
+#include "TestCommon.h"
 #include <stdio.h>
 #include "nsCRT.h" /* should be "plstr.h"? */
 #include "nsNetUtil.h"
@@ -217,6 +218,9 @@ print_usage()
 int
 main(int argc, char **argv)
 {
+    if (test_common_init(&argc, &argv) != 0)
+        return -1;
+
     nsresult rv;
     PRBool sync;
 

netwerk/test/TestProtocols.cpp

@@ -44,6 +44,8 @@
     -Gagan Saksena 04/29/99
 */
 
+#include "TestCommon.h"
+
 #define FORCE_PR_LOG
 #include <stdio.h>
 #ifdef WIN32 
@@ -730,6 +732,9 @@ nsresult LoadURLFromConsole()
 int
 main(int argc, char* argv[])
 {
+    if (test_common_init(&argc, &argv) != 0)
+        return -1;
+
     nsresult rv= (nsresult)-1;
     if (argc < 2) {
         printf("usage: %s [-verbose] [-file <name>] [-resume <startoffset> [-entityid <entityid>]] [-proxy <proxy>] [-console] <url> <url> ... \n", argv[0]);

netwerk/test/TestServ.cpp

@@ -35,6 +35,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+#include "TestCommon.h"
 #include <stdlib.h>
 #include "nsIServiceManager.h"
 #include "nsIEventQueueService.h"
@@ -144,6 +145,9 @@ MakeServer(PRInt32 port)
 int
 main(int argc, char* argv[])
 {
+    if (test_common_init(&argc, &argv) != 0)
+        return -1;
+
     nsresult rv= (nsresult)-1;
     if (argc < 2) {
         printf("usage: %s <port>\n", argv[0]);

netwerk/test/TestSocketTransport.cpp

@@ -35,6 +35,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+#include "TestCommon.h"
 #include "nsIComponentRegistrar.h"
 #include "nsISocketTransportService.h"
 #include "nsISocketTransport.h"
@@ -280,6 +281,9 @@ RunTest(nsISocketTransportService *sts,
 int
 main(int argc, char* argv[])
 {
+    if (test_common_init(&argc, &argv) != 0)
+        return -1;
+
     nsresult rv;
 
     if (argc < 4) {

netwerk/test/TestStandardURL.cpp

@@ -1,3 +1,4 @@
+#include "TestCommon.h"
 #include <stdlib.h>
 #include "nsCOMPtr.h"
 #include "nsIServiceManager.h"
@@ -85,6 +86,9 @@ static void ref_test()
 
 int main(int argc, char **argv)
 {
+    if (test_common_init(&argc, &argv) != 0)
+        return -1;
+
     if (argc < 2) {
         printf("usage: TestURL url [count]\n");
         return -1;

netwerk/test/TestStreamChannel.cpp

@@ -35,6 +35,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+#include "TestCommon.h"
 #include "nsIComponentRegistrar.h"
 #include "nsIStreamTransportService.h"
 #include "nsIAsyncInputStream.h"
@@ -244,6 +245,9 @@ RunTest(nsIFile *file)
 int
 main(int argc, char* argv[])
 {
+    if (test_common_init(&argc, &argv) != 0)
+        return -1;
+
     nsresult rv;
 
     if (argc < 2) {

netwerk/test/TestStreamLoader.cpp

@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include "TestCommon.h"
 #include "nsNetUtil.h"
 #include "nsEventQueueUtils.h"
 #include "prlog.h"
@@ -42,6 +43,9 @@ MyStreamLoaderObserver::OnStreamComplete(nsIStreamLoader *loader,
 
 int main(int argc, char **argv)
 {
+  if (test_common_init(&argc, &argv) != 0)
+    return -1;
+
   if (argc < 2) {
     printf("usage: %s <url>\n", argv[0]);
     return -1;

netwerk/test/TestStreamPump.cpp

@@ -35,6 +35,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+#include "TestCommon.h"
 #include "nsIComponentRegistrar.h"
 #include "nsIStreamTransportService.h"
 #include "nsIAsyncInputStream.h"
@@ -202,6 +203,9 @@ RunTest(nsIFile *file, PRInt32 offset, PRInt32 length)
 int
 main(int argc, char* argv[])
 {
+    if (test_common_init(&argc, &argv) != 0)
+        return -1;
+
     nsresult rv;
 
     if (argc < 4) {

netwerk/test/TestStreamTransport.cpp

@@ -35,6 +35,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+#include "TestCommon.h"
 #include "nsIComponentRegistrar.h"
 #include "nsIStreamTransportService.h"
 #include "nsIAsyncInputStream.h"
@@ -335,6 +336,9 @@ RunBlockingTest(nsIFile *srcFile, nsIFile *destFile)
 int
 main(int argc, char* argv[])
 {
+    if (test_common_init(&argc, &argv) != 0)
+        return -1;
+
     nsresult rv;
 
     if (argc < 2) {

netwerk/test/TestURLParser.cpp

@@ -1,3 +1,4 @@
+#include "TestCommon.h"
 #include <stdio.h>
 #include "nsIURLParser.h"
 #include "nsCOMPtr.h"
@@ -87,6 +88,9 @@ parse_path(nsIURLParser *urlParser, char *path, PRInt32 pathLen)
 int
 main(int argc, char **argv)
 {
+    if (test_common_init(&argc, &argv) != 0)
+        return -1;
+
     if (argc < 2) {
         printf("usage: TestURLParser [-std|-noauth|-auth] <url>\n");
         return -1;

netwerk/test/TestUpload.cpp

@@ -35,6 +35,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+#include "TestCommon.h"
 #ifdef WIN32 
 #include <windows.h>
 #endif
@@ -133,6 +134,9 @@ InputTestConsumer::OnStopRequest(nsIRequest *request, nsISupports* context,
 int
 main(int argc, char* argv[])
 {
+    if (test_common_init(&argc, &argv) != 0)
+        return -1;
+
     nsresult rv;
 
     if (argc < 2) {

netwerk/test/urltest.cpp

@@ -43,6 +43,7 @@
 
 #include <stdio.h>
 
+#include "TestCommon.h"
 #include "plstr.h"
 #include "nsIServiceManager.h"
 #include "nsIIOService.h"
@@ -410,6 +411,9 @@ void printusage(void)
 
 int main(int argc, char **argv)
 {
+    if (test_common_init(&argc, &argv) != 0)
+        return -1;
+
     int rv = -1;
 
     if (argc < 2) {