From 22d80aeb7e8bf7092839b496db6105db168522f0 Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <nnethercote@mozilla.com>
Date: Tue, 15 Sep 2015 17:39:12 -0700
Subject: [PATCH] Bug 1202971 (part 2) - Fix compile warnings in
 toolkit/mozapps/update/tests. r=rstrong.

---
 toolkit/mozapps/update/tests/TestAUSHelper.cpp | 4 +++-
 toolkit/mozapps/update/tests/moz.build         | 3 ---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/toolkit/mozapps/update/tests/TestAUSHelper.cpp b/toolkit/mozapps/update/tests/TestAUSHelper.cpp
index 4273afdef8b..a13ce3b16fe 100644
--- a/toolkit/mozapps/update/tests/TestAUSHelper.cpp
+++ b/toolkit/mozapps/update/tests/TestAUSHelper.cpp
@@ -245,7 +245,9 @@ int NS_main(int argc, NS_tchar **argv)
       NS_tfputs(NS_T("test"), file);
       fclose(file);
     }
-    symlink(path, argv[5]);
+    if (symlink(path, argv[5]) != 0) {
+      return 1;
+    }
     NS_tsnprintf(path, sizeof(path)/sizeof(path[0]),
                  NS_T("%s/%s"), NS_T("/tmp"), argv[2]);
     if (argc > 6 && !NS_tstrcmp(argv[6], NS_T("change-perm"))) {
diff --git a/toolkit/mozapps/update/tests/moz.build b/toolkit/mozapps/update/tests/moz.build
index e3ee3dbfdc5..8704250d8bd 100644
--- a/toolkit/mozapps/update/tests/moz.build
+++ b/toolkit/mozapps/update/tests/moz.build
@@ -57,6 +57,3 @@ if CONFIG['OS_ARCH'] == 'WINNT':
     USE_STATIC_LIBS = True
     if CONFIG['GNU_CC']:
         WIN32_EXE_LDFLAGS += ['-municode']
-
-# XXX: We should fix these warnings
-ALLOW_COMPILER_WARNINGS = True