From b185498dc4c5a6c08826785aaee62c08f162f083 Mon Sep 17 00:00:00 2001
From: Eric Faust <efausbmo@gmail.com>
Date: Tue, 9 Oct 2018 15:41:50 -0700
Subject: [PATCH] Bug 1496297 - Use |jit-test| skip-if as appropriate in
 jit-test/tests/baseline/ (r=jorendorff)

--HG--
extra : rebase_source : 9822a2e5ce4f8b0bff43fd699cd2ceac4aea19e7
---
 js/src/jit-test/tests/baseline/bug1209585.js | 6 +-----
 js/src/jit-test/tests/baseline/bug1247862.js | 3 +--
 js/src/jit-test/tests/baseline/bug1344334.js | 3 +--
 js/src/jit-test/tests/baseline/bug1491337.js | 3 +--
 js/src/jit-test/tests/baseline/bug1491350.js | 3 +--
 5 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/js/src/jit-test/tests/baseline/bug1209585.js b/js/src/jit-test/tests/baseline/bug1209585.js
index b7e941731901..f089cbf3027f 100644
--- a/js/src/jit-test/tests/baseline/bug1209585.js
+++ b/js/src/jit-test/tests/baseline/bug1209585.js
@@ -1,8 +1,4 @@
-if (helperThreadCount() == 0)
-    quit();
-
-if (!("oomAtAllocation" in this && "resetOOMFailure" in this))
-    quit();
+// |jit-test| skip-if: helperThreadCount() === 0 || !('oomAtAllocation' in this)
 
 if ("gczeal" in this)
     gczeal(0);
diff --git a/js/src/jit-test/tests/baseline/bug1247862.js b/js/src/jit-test/tests/baseline/bug1247862.js
index 706253e94e19..03aba177c0c9 100644
--- a/js/src/jit-test/tests/baseline/bug1247862.js
+++ b/js/src/jit-test/tests/baseline/bug1247862.js
@@ -1,5 +1,4 @@
-if (!this.hasOwnProperty("TypedObject"))
-  quit();
+// |jit-test| skip-if: !this.hasOwnProperty("TypedObject")
 
 var T = TypedObject;
 ValueStruct = new T.StructType({
diff --git a/js/src/jit-test/tests/baseline/bug1344334.js b/js/src/jit-test/tests/baseline/bug1344334.js
index 66994338af8c..82451488337b 100644
--- a/js/src/jit-test/tests/baseline/bug1344334.js
+++ b/js/src/jit-test/tests/baseline/bug1344334.js
@@ -1,5 +1,4 @@
-if (!('oomTest' in this))
-    quit();
+// |jit-test| skip-if: !('oomTest' in this)
 
 function f(s) {
     s + "x";
diff --git a/js/src/jit-test/tests/baseline/bug1491337.js b/js/src/jit-test/tests/baseline/bug1491337.js
index f619d8a6a7cd..107507155f61 100644
--- a/js/src/jit-test/tests/baseline/bug1491337.js
+++ b/js/src/jit-test/tests/baseline/bug1491337.js
@@ -1,5 +1,4 @@
-if (!('oomTest' in this))
-    quit();
+// |jit-test| skip-if: !('oomTest' in this)
 
 oomTest(new Function(`
   let kJSEmbeddingMaxTypes = 1000000;
diff --git a/js/src/jit-test/tests/baseline/bug1491350.js b/js/src/jit-test/tests/baseline/bug1491350.js
index aef327acdbfd..697a39c50c0d 100644
--- a/js/src/jit-test/tests/baseline/bug1491350.js
+++ b/js/src/jit-test/tests/baseline/bug1491350.js
@@ -1,5 +1,4 @@
-if (!('oomTest' in this))
-  quit();
+// |jit-test| skip-if: !('oomTest' in this)
 
 oomTest(new Function(`
   var a = ['p', 'q', 'r', 's', 't'];