From 5e453adaf5a41e2a964c6ff8d659f19eab8c24d5 Mon Sep 17 00:00:00 2001
From: Nathan Froyd <froydnj@mozilla.com>
Date: Thu, 31 Jul 2014 16:16:27 -0400
Subject: [PATCH] Bug 1048306 - move TestDllInterceptor to CPP_UNIT_TESTS;
 r=mshal

---
 toolkit/xre/test/win/Makefile.in | 2 --
 toolkit/xre/test/win/moz.build   | 9 ++++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/toolkit/xre/test/win/Makefile.in b/toolkit/xre/test/win/Makefile.in
index 9f18073b1af5..331a8a4fdcaa 100644
--- a/toolkit/xre/test/win/Makefile.in
+++ b/toolkit/xre/test/win/Makefile.in
@@ -12,5 +12,3 @@ libs:: TestXREMakeCommandLineWin.ini
 check::
 	@echo 'Running TestXREMakeCommandLineWin tests'
 	@$(RUN_TEST_PROGRAM) $(FINAL_TARGET)/TestXREMakeCommandLineWin.exe
-	@echo 'Running TestDllInterceptor tests'
-	@$(RUN_TEST_PROGRAM) $(FINAL_TARGET)/TestDllInterceptor.exe
diff --git a/toolkit/xre/test/win/moz.build b/toolkit/xre/test/win/moz.build
index 370e8f4c8819..d69dbf6d7aa3 100644
--- a/toolkit/xre/test/win/moz.build
+++ b/toolkit/xre/test/win/moz.build
@@ -5,7 +5,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 SIMPLE_PROGRAMS = [
-    'TestDllInterceptor',
     'TestXREMakeCommandLineWin',
 ]
 
@@ -13,6 +12,14 @@ SOURCES += [
     '%s.cpp' % s for s in SIMPLE_PROGRAMS
 ]
 
+CPP_UNIT_TESTS += [
+    'TestDllInterceptor',
+]
+
+SOURCES += [
+    '%s.cpp' % s for s in CPP_UNIT_TESTS
+]
+
 DEFINES['NS_NO_XPCOM'] = True
 
 LOCAL_INCLUDES += [