--- a/ipc/Makefile.in
+++ b/ipc/Makefile.in
@@ -36,12 +36,12 @@
DEPTH = ..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-DIRS += test-harness testshell
+DIRS += testshell
TOOL_DIRS = app
include $(topsrcdir)/config/rules.mk
--- a/ipc/ipdl/Makefile.in
+++ b/ipc/ipdl/Makefile.in
@@ -43,17 +43,16 @@ include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk
IPDLDIRS = \
dom/plugins \
dom/ipc \
netwerk/ipc \
netwerk/protocol/http/src \
ipc/ipdl/test/cxx \
- ipc/test-harness \
ipc/testshell \
$(NULL)
vpath %.ipdl $(topsrcdir)
define ADD_IPDLDIR
include $(topsrcdir)/$(IPDLDIR)/ipdl.mk
ALL_IPDLSRCS += $$(IPDLSRCS:%=$(IPDLDIR)/%)
deleted file mode 100644
--- a/ipc/test-harness/Makefile.in
+++ /dev/null
@@ -1,70 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is Mozilla Firefox.
-#
-# The Initial Developer of the Original Code is
-# The Mozilla Foundation <http://www.mozilla.org/>.
-# Portions created by the Initial Developer are Copyright (C) 2009
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH = ../..
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE = ipctestharness
-
-EXPORTS_NAMESPACES = mozilla/test
-EXPORTS_mozilla/test = \
- TestChild.h \
- TestParent.h \
- TestProcessParent.h \
- TestThreadChild.h \
- $(NULL)
-
-LIBRARY_NAME = ipctestharness_s
-LIBXUL_LIBRARY = 1
-FORCE_STATIC_LIB = 1
-EXPORT_LIBRARY = 1
-
-CPPSRCS = \
- TestChild.cpp \
- TestParent.cpp \
- TestProcessParent.cpp \
- TestThreadChild.cpp \
- $(NULL)
-
-TOOL_DIRS += app
-
-include $(topsrcdir)/config/config.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/ipc/test-harness/PTest.ipdl
+++ /dev/null
@@ -1,106 +0,0 @@
-/* -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 8 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla IPDL Test Harness.
- *
- * The Initial Developer of the Original Code is
- * Chris Jones <jones.chris.g@gmail.com>.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-//-----------------------------------------------------------------------------
-// "Hello world" example
-namespace mozilla {
-namespace test {
-
-protocol PTest
-{
-child:
- Hello();
-
-parent:
- World();
-};
-
-} // namespace test
-} // namespace mozilla
-
-//-----------------------------------------------------------------------------
-// Example solution to exercise
- /*
-namespace mozilla {
-namespace test {
-
-sync protocol PTest
-{
-both:
- Ping();
- Pong(int status);
-
-parent:
- GetValue(nsCString key);
- GetValues(nsCString[] keys);
- sync SetValue(nsCString key, nsCString val) returns (bool ok);
-
-child:
- TellValue(nsCString key, nsCString val);
- TellValues(nsCString[] keys, nsCString[] vals);
-
-state START:
- send Ping goto START;
- recv Pong goto START;
-
- recv SetValue goto HAVE_VALUES;
-
-state HAVE_VALUES:
- send Ping goto HAVE_VALUES;
- recv Pong goto HAVE_VALUES;
-
- recv SetValue goto HAVE_VALUES;
-
- recv GetValue goto TELLING_VALUE;
- recv GetValues goto TELLING_VALUES;
-
-state TELLING_VALUE:
- send Ping goto TELLING_VALUE;
- recv Pong goto TELLING_VALUE;
-
- send TellValue goto HAVE_VALUES;
-
-state TELLING_VALUES:
- send Ping goto TELLING_VALUES;
- recv Pong goto TELLING_VALUES;
-
- send TellValues goto HAVE_VALUES;
-};
-
-} // namespace test
-} // namespace mozilla
-*/
deleted file mode 100644
--- a/ipc/test-harness/TestChild.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/* -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 8 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla IPDL Test Harness.
- *
- * The Initial Developer of the Original Code is
- * Chris Jones <jones.chris.g@gmail.com>.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "TestChild.h"
-
-using mozilla::test::TestChild;
-
-// C++ file contents
-TestChild::TestChild()
-{
-}
-
-TestChild::~TestChild()
-{
-}
-
-#if 1
-//-----------------------------------------------------------------------------
-// "Hello world" example
-bool TestChild::RecvHello()
-{
- puts("[TestChild] Hello, ");
- SendWorld();
- return true;
-}
-
-
-#elif 0
-//-----------------------------------------------------------------------------
-// Example solution to exercise
-bool TestChild::RecvPing()
-{
- return SendPong(42);
-}
-
-bool TestChild::RecvPong(const int& status)
-{
- return false;
-}
-
-bool TestChild::RecvTellValue(
- const String& key,
- const String& val)
-{
- return false;
-}
-
-bool TestChild::RecvTellValues(
- const StringArray& keys,
- const StringArray& vals)
-{
- return false;
-}
-#endif
deleted file mode 100644
--- a/ipc/test-harness/TestChild.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 8 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla IPDL Test Harness.
- *
- * The Initial Developer of the Original Code is
- * Chris Jones <jones.chris.g@gmail.com>.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef ipc_test_harness_TestChild_h
-#define ipc_test_harness_TestChild_h 1
-
-#include "mozilla/test/PTestChild.h"
-
-namespace mozilla {
-namespace test {
-
-// Header file contents
-class TestChild : public PTestChild
-{
-protected:
-
-#if 1
-//-----------------------------------------------------------------------------
-// "Hello world" example
- virtual bool RecvHello();
-
-
-#elif 0
-//-----------------------------------------------------------------------------
-// Example solution to exercise
- virtual bool RecvPing();
- virtual bool RecvPong(const int& status);
- virtual bool RecvTellValue(
- const String& key,
- const String& val);
- virtual bool RecvTellValues(
- const StringArray& keys,
- const StringArray& vals);
-#endif
-
-public:
- TestChild();
- virtual ~TestChild();
-};
-
-} // namespace test
-} // namespace mozilla
-
-#endif /* ipc_test_harness_TestChild_h */
deleted file mode 100644
--- a/ipc/test-harness/TestParent.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-/* -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 8 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla IPDL Test Harness.
- *
- * The Initial Developer of the Original Code is
- * Chris Jones <jones.chris.g@gmail.com>.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "TestParent.h"
-
-using mozilla::test::TestParent;
-
-// C++ file contents
-TestParent::TestParent()
-{
-}
-
-TestParent::~TestParent()
-{
-}
-
-
-void
-TestParent::DoStuff()
-{
-#if 1
- puts("[TestParent] in DoStuff()");
- SendHello();
-#elif 0
- puts("[TestParent] pinging child ...");
- SendPing();
-#endif
-}
-
-
-#if 1
-//-----------------------------------------------------------------------------
-// "Hello world" exampl
-bool TestParent::RecvWorld()
-{
- puts("[TestParent] world!");
- return true;
-}
-
-
-#elif 0
-//-----------------------------------------------------------------------------
-// Example solution to exercise
-bool TestParent::RecvPing()
-{
- return false;
-}
-
-bool TestParent::RecvPong(const int& status)
-{
- printf("[TestParent] child replied to ping with status code %d\n", status);
- return true;
-}
-
-bool TestParent::RecvGetValue(const String& key)
-{
- return false;
-}
-
-bool TestParent::RecvGetValues(const StringArray& keys)
-{
- return false;
-}
-
-bool TestParent::RecvSetValue(
- const String& key,
- const String& val,
- bool* ok)
-{
- return false;
-}
-
-#endif
deleted file mode 100644
--- a/ipc/test-harness/TestParent.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 8 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla IPDL Test Harness.
- *
- * The Initial Developer of the Original Code is
- * Chris Jones <jones.chris.g@gmail.com>.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef ipc_test_harness_TestParent_h
-#define ipc_test_harness_TestParent_h 1
-
-#include "mozilla/test/PTestParent.h"
-
-namespace mozilla {
-namespace test {
-
-// Header file contents
-class TestParent : public PTestParent
-{
-protected:
-#if 1
-//-----------------------------------------------------------------------------
-// "Hello world" example
- virtual bool RecvWorld();
-
-
-#elif 0
-//-----------------------------------------------------------------------------
-// Example solution to exercise
- virtual bool RecvPing();
- virtual bool RecvPong(const int& status);
- virtual bool RecvGetValue(const String& key);
- virtual bool RecvGetValues(const StringArray& keys);
- virtual bool RecvSetValue(
- const String& key,
- const String& val,
- bool* ok);
-#endif
-
-public:
- TestParent();
- virtual ~TestParent();
-
- void DoStuff();
-};
-
-} // namespace test
-} // namespace mozilla
-
-#endif /* ipc_test_harness_TestParent_h */
deleted file mode 100644
--- a/ipc/test-harness/TestProcessParent.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 8 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla IPDL Test Harness.
- *
- * The Initial Developer of the Original Code is
- * Chris Jones <jones.chris.g@gmail.com>.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "TestProcessParent.h"
-
-using mozilla::ipc::GeckoChildProcessHost;
-
-namespace mozilla {
-namespace test {
-
-TestProcessParent::TestProcessParent() :
- GeckoChildProcessHost(GeckoProcessType_TestHarness)
-{
-}
-
-TestProcessParent::~TestProcessParent()
-{
-}
-
-} // namespace test
-} // namespace mozilla
deleted file mode 100644
--- a/ipc/test-harness/TestProcessParent.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 8 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla IPDL Test Harness.
- *
- * The Initial Developer of the Original Code is
- * Chris Jones <jones.chris.g@gmail.com>.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef ipc_test_harness_TestProcessParent_h
-#define ipc_test_harness_TestProcessParent_h 1
-
-#include "mozilla/ipc/GeckoChildProcessHost.h"
-
-namespace mozilla {
-namespace test {
-//-----------------------------------------------------------------------------
-
-class TestProcessParent : public mozilla::ipc::GeckoChildProcessHost
-{
-public:
- TestProcessParent();
- ~TestProcessParent();
-
- /**
- * Asynchronously launch the plugin process.
- */
- // Could override parent Launch, but don't need to here
- //bool Launch();
-
-private:
- DISALLOW_EVIL_CONSTRUCTORS(TestProcessParent);
-};
-
-
-} // namespace plugins
-} // namespace mozilla
-
-#endif // ifndef ipc_test_harness_TestProcessParent_h
deleted file mode 100644
--- a/ipc/test-harness/TestThreadChild.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 8 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla IPDL Test Harness.
- *
- * The Initial Developer of the Original Code is
- * Chris Jones <jones.chris.g@gmail.com>.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "TestThreadChild.h"
-
-using mozilla::test::TestThreadChild;
-using mozilla::ipc::GeckoThread;
-
-TestThreadChild::TestThreadChild(ProcessHandle aParentHandle) :
- GeckoThread(aParentHandle)
-{
-}
-
-TestThreadChild::~TestThreadChild()
-{
-}
-
-void
-TestThreadChild::Init()
-{
- GeckoThread::Init();
- mChild.Open(channel(), GetParentProcessHandle(), owner_loop());
-}
-
-void
-TestThreadChild::CleanUp()
-{
- GeckoThread::CleanUp();
- mChild.Close();
-}
deleted file mode 100644
--- a/ipc/test-harness/TestThreadChild.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 8 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla IPDL Test Harness.
- *
- * The Initial Developer of the Original Code is
- * Chris Jones <jones.chris.g@gmail.com>.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef ipc_test_harness_TestThreadChild_h
-#define ipc_test_harness_TestThreadChild_h 1
-
-#include "mozilla/ipc/GeckoThread.h"
-#include "mozilla/test/TestChild.h"
-
-namespace mozilla {
-namespace test {
-
-class TestThreadChild : public mozilla::ipc::GeckoThread
-{
-public:
- TestThreadChild(ProcessHandle aParentHandle);
- ~TestThreadChild();
-
-protected:
- virtual void Init();
- virtual void CleanUp();
-
-private:
- TestChild mChild;
-};
-
-} // namespace test
-} // namespace mozilla
-
-#endif // ifndef ipc_test_harness_TestThreadChild_h
deleted file mode 100644
--- a/ipc/test-harness/app/Makefile.in
+++ /dev/null
@@ -1,74 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is Mozilla IPCShell.
-#
-# The Initial Developer of the Original Code is
-# Ben Turner <bent.mozilla@gmail.com>.
-# Portions created by the Initial Developer are Copyright (C) 2009
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH = ../../..
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE = ipctestharness
-PROGRAM = $(MODULE)$(BIN_SUFFIX)
-ENABLE_CXX_EXCEPTIONS = 1
-
-LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
-
-CPPSRCS = \
- TestApp.cpp \
- $(NULL)
-
-LIBS = \
- $(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
- $(LIBXUL_LIBS) \
- $(MOZ_JS_LIBS) \
- $(NSPR_LIBS) \
- $(NULL)
-
-NSDISTMODE = copy
-
-include $(topsrcdir)/config/config.mk
-
-ifdef _MSC_VER
-ifdef WINCE
-WIN32_EXE_LDFLAGS += -ENTRY:mainWCRTStartup
-else
-WIN32_EXE_LDFLAGS += -ENTRY:wmainCRTStartup
-endif
-endif
-
-include $(topsrcdir)/ipc/chromium/chromium-config.mk
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/ipc/test-harness/app/TestApp.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla IPCShell.
- *
- * The Initial Developer of the Original Code is
- * Ben Turner <bent.mozilla@gmail.com>.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nsXULAppAPI.h"
-
-#if defined(XP_WIN)
-#include <windows.h>
-#include "nsWindowsWMain.cpp"
-#endif
-
-int
-main(int argc, char* argv[])
-{
- return XRE_RunIPCTestHarness(argc, argv);
-}
deleted file mode 100644
--- a/ipc/test-harness/ipdl.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-IPDLSRCS = \
- PTest.ipdl \
- $(NULL)
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -723,17 +723,16 @@ nsXULAppInfo::GetWidgetToolkit(nsACStrin
// xpcom/system/nsIXULRuntime.idl.
#define SYNC_ENUMS(a,b) \
PR_STATIC_ASSERT(nsIXULRuntime::PROCESS_TYPE_ ## a == \
static_cast<int>(GeckoProcessType_ ## b));
SYNC_ENUMS(DEFAULT, Default)
SYNC_ENUMS(PLUGIN, Plugin)
SYNC_ENUMS(CONTENT, Content)
-SYNC_ENUMS(TESTHARNESS, TestHarness)
SYNC_ENUMS(IPDLUNITTEST, IPDLUnitTest)
// .. and ensure that that is all of them:
PR_STATIC_ASSERT(GeckoProcessType_IPDLUnitTest + 1 == GeckoProcessType_End);
NS_IMETHODIMP
nsXULAppInfo::GetProcessType(PRUint32* aResult)
{
--- a/toolkit/xre/nsEmbedFunctions.cpp
+++ b/toolkit/xre/nsEmbedFunctions.cpp
@@ -79,19 +79,16 @@
#include "mozilla/plugins/PluginThreadChild.h"
#include "mozilla/dom/ContentProcessThread.h"
#include "mozilla/dom/ContentProcessParent.h"
#include "mozilla/dom/ContentProcessChild.h"
#include "mozilla/ipc/TestShellParent.h"
#include "mozilla/ipc/XPCShellEnvironment.h"
-#include "mozilla/test/TestParent.h"
-#include "mozilla/test/TestProcessParent.h"
-#include "mozilla/test/TestThreadChild.h"
#include "mozilla/Monitor.h"
#ifdef MOZ_IPDL_TESTS
#include "mozilla/_ipdltest/IPDLUnitTests.h"
#include "mozilla/_ipdltest/IPDLUnitTestThreadChild.h"
using mozilla::_ipdltest::IPDLUnitTestThreadChild;
#endif // ifdef MOZ_IPDL_TESTS
@@ -104,20 +101,16 @@ using mozilla::ipc::ScopedXREEmbed;
using mozilla::plugins::PluginThreadChild;
using mozilla::dom::ContentProcessThread;
using mozilla::dom::ContentProcessParent;
using mozilla::dom::ContentProcessChild;
using mozilla::ipc::TestShellParent;
using mozilla::ipc::TestShellCommandParent;
using mozilla::ipc::XPCShellEnvironment;
-using mozilla::test::TestParent;
-using mozilla::test::TestProcessParent;
-using mozilla::test::TestThreadChild;
-
using mozilla::Monitor;
using mozilla::MonitorAutoEnter;
#endif
static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID);
void
XRE_GetStaticComponents(nsStaticModuleInfo const **aStaticComponents,
@@ -305,20 +298,16 @@ XRE_InitChildProcess(int aArgc,
case GeckoProcessType_Plugin:
mainThread = new PluginThreadChild(parentHandle);
break;
case GeckoProcessType_Content:
mainThread = new ContentProcessThread(parentHandle);
break;
- case GeckoProcessType_TestHarness:
- mainThread = new TestThreadChild(parentHandle);
- break;
-
case GeckoProcessType_IPDLUnitTest:
#ifdef MOZ_IPDL_TESTS
mainThread = new IPDLUnitTestThreadChild(parentHandle);
#else
NS_RUNTIMEABORT("rebuild with --enable-ipdl-tests");
#endif
break;
@@ -413,42 +402,16 @@ XRE_InitParentProcess(int aArgc,
NS_WARNING("Failed to run appshell");
return NS_ERROR_FAILURE;
}
}
return NS_OK;
}
-//-----------------------------------------------------------------------------
-// TestHarness
-
-static void
-IPCTestHarnessMain(void* data)
-{
- TestProcessParent* subprocess = new TestProcessParent(); // leaks
- bool launched = subprocess->SyncLaunch();
- NS_ASSERTION(launched, "can't launch subprocess");
-
- TestParent* parent = new TestParent(); // leaks
- parent->Open(subprocess->GetChannel(),
- subprocess->GetChildProcessHandle());
- parent->DoStuff();
-}
-
-int
-XRE_RunIPCTestHarness(int aArgc, char* aArgv[])
-{
- nsresult rv =
- XRE_InitParentProcess(
- aArgc, aArgv, IPCTestHarnessMain, NULL);
- NS_ENSURE_SUCCESS(rv, 1);
- return 0;
-}
-
#ifdef MOZ_IPDL_TESTS
//-----------------------------------------------------------------------------
// IPDL unit test
int
XRE_RunIPDLTest(int aArgc, char** aArgv)
{
if (aArgc < 2) {
--- a/xpcom/build/nsXULAppAPI.h
+++ b/xpcom/build/nsXULAppAPI.h
@@ -420,28 +420,26 @@ XRE_API(void,
XRE_FreeAppData, (nsXREAppData *aAppData))
enum GeckoProcessType {
GeckoProcessType_Default = 0,
GeckoProcessType_Plugin,
GeckoProcessType_Content,
- GeckoProcessType_TestHarness,
GeckoProcessType_IPDLUnitTest,
GeckoProcessType_End,
GeckoProcessType_Invalid = GeckoProcessType_End
};
static const char* const kGeckoProcessTypeString[] = {
"default",
"plugin",
"tab",
- "testharness",
"ipdlunittest"
};
PR_STATIC_ASSERT(sizeof(kGeckoProcessTypeString) /
sizeof(kGeckoProcessTypeString[0]) ==
GeckoProcessType_End);
--- a/xpcom/system/nsIXULRuntime.idl
+++ b/xpcom/system/nsIXULRuntime.idl
@@ -88,18 +88,17 @@ interface nsIXULRuntime : nsISupports
readonly attribute AUTF8String widgetToolkit;
/**
* The legal values of processType.
*/
const unsigned long PROCESS_TYPE_DEFAULT = 0;
const unsigned long PROCESS_TYPE_PLUGIN = 1;
const unsigned long PROCESS_TYPE_CONTENT = 2;
- const unsigned long PROCESS_TYPE_TESTHARNESS = 3;
- const unsigned long PROCESS_TYPE_IPDLUNITTEST = 4;
+ const unsigned long PROCESS_TYPE_IPDLUNITTEST = 3;
/**
* The type of the caller's process. Returns one of the values above.
*/
readonly attribute unsigned long processType;
/**
* Signal the apprunner to invalidate caches on the next restart.