From 12db1272efee8816a676f8409d5d1d7e64388217 Mon Sep 17 00:00:00 2001
From: Jeff Gilbert <jdashg@gmail.com>
Date: Tue, 10 Aug 2021 17:46:04 -0700
Subject: [PATCH] Add failure if "Duplicate notifyFinishedToHarness()". (#3311)

This ends up being an error in Firefox's harness, so let's prevent it
upstream too.
---
 sdk/tests/conformance/glsl/bugs/character-set.html | 2 --
 sdk/tests/js/js-test-pre.js                        | 5 +++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sdk/tests/conformance/glsl/bugs/character-set.html b/sdk/tests/conformance/glsl/bugs/character-set.html
index 1ba854613c..6d6fca5f89 100644
--- a/sdk/tests/conformance/glsl/bugs/character-set.html
+++ b/sdk/tests/conformance/glsl/bugs/character-set.html
@@ -111,7 +111,5 @@
 var successfullyParsed = true;
 
 </script>
-<script src="../../../js/js-test-post.js"></script>
-
 </body>
 </html>
diff --git a/sdk/tests/js/js-test-pre.js b/sdk/tests/js/js-test-pre.js
index 5d61c64f1b..8288a3ae7c 100644
--- a/sdk/tests/js/js-test-pre.js
+++ b/sdk/tests/js/js-test-pre.js
@@ -112,6 +112,11 @@ function reportSkippedTestResultsToHarness(success, msg) {
 }
 
 function notifyFinishedToHarness() {
+  if (window._didNotifyFinishedToHarness) {
+    testFailed("Duplicate notifyFinishedToHarness()");
+  }
+  window._didNotifyFinishedToHarness = true;
+
   if (window.parent.webglTestHarness) {
     window.parent.webglTestHarness.notifyFinished(window.location.pathname);
   }