From dda334968fa7e479935dd1f056993e869367f038 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Wed, 27 Jul 2016 13:13:24 -0400
Subject: [PATCH] Attach more signals to the backtrace signal handler.

---
 components/servo/main.rs                                     | 5 ++++-
 .../conformance/more/functions/readPixelsBadArgs.html.ini    | 2 +-
 .../conformance/reading/read-pixels-pack-alignment.html.ini  | 2 +-
 .../conformance/rendering/draw-arrays-out-of-bounds.html.ini | 2 +-
 .../rendering/draw-elements-out-of-bounds.html.ini           | 2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/components/servo/main.rs b/components/servo/main.rs
index a13c2ca8b5d4..64112fde54bc 100644
--- a/components/servo/main.rs
+++ b/components/servo/main.rs
@@ -70,7 +70,10 @@ fn install_crash_handler() {
         }
     }
 
-    signal!(Sig::SEGV, handler);
+    signal!(Sig::SEGV, handler); // handle segfaults
+    signal!(Sig::ILL, handler); // handle stack overflow and unsupported CPUs
+    signal!(Sig::IOT, handler); // handle double panics
+    signal!(Sig::BUS, handler); // handle invalid memory access
 }
 
 #[cfg(target_os = "android")]
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/more/functions/readPixelsBadArgs.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/more/functions/readPixelsBadArgs.html.ini
index 104168d037f5..7f14a9449b16 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/more/functions/readPixelsBadArgs.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/more/functions/readPixelsBadArgs.html.ini
@@ -1,6 +1,6 @@
 [readPixelsBadArgs.html]
   type: testharness
-  expected: CRASH
+  expected: TIMEOUT
   [WebGL test #0: testReadPixels]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/reading/read-pixels-pack-alignment.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/reading/read-pixels-pack-alignment.html.ini
index d37219b0864e..1b3d09229b95 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/reading/read-pixels-pack-alignment.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/reading/read-pixels-pack-alignment.html.ini
@@ -1,6 +1,6 @@
 [read-pixels-pack-alignment.html]
   type: testharness
-  expected: CRASH
+  expected: TIMEOUT
   [WebGL test #3: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/draw-arrays-out-of-bounds.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/draw-arrays-out-of-bounds.html.ini
index 1459ace05e4c..64503c921e51 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/draw-arrays-out-of-bounds.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/draw-arrays-out-of-bounds.html.ini
@@ -1,3 +1,3 @@
 [draw-arrays-out-of-bounds.html]
   type: testharness
-  expected: CRASH
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/draw-elements-out-of-bounds.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/draw-elements-out-of-bounds.html.ini
index 5c4701a6660f..73287c519b5a 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/draw-elements-out-of-bounds.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/draw-elements-out-of-bounds.html.ini
@@ -1,3 +1,3 @@
 [draw-elements-out-of-bounds.html]
   type: testharness
-  expected: CRASH
+  expected: TIMEOUT