From dc202491556478bdb6bfbdfe287e43ae667634c1 Mon Sep 17 00:00:00 2001
From: "szegedia%freemail.hu"
 <szegedia%freemail.hu@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 11 Oct 2007 13:50:44 +0000
Subject: [PATCH] Must call Thread.stop *before* status.timedOut, as
 JUnitStatus actually throws an assertion error

git-svn-id: svn://10.0.0.236/trunk@237587 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../testsrc/org/mozilla/javascript/drivers/ShellTest.java      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mozilla/js/rhino/testsrc/org/mozilla/javascript/drivers/ShellTest.java b/mozilla/js/rhino/testsrc/org/mozilla/javascript/drivers/ShellTest.java
index 4743204c2aa..04c42935ffa 100644
--- a/mozilla/js/rhino/testsrc/org/mozilla/javascript/drivers/ShellTest.java
+++ b/mozilla/js/rhino/testsrc/org/mozilla/javascript/drivers/ShellTest.java
@@ -300,14 +300,15 @@ class ShellTest {
                 }
             }
         }, jsFile.getPath());
+        t.setDaemon(true);
         t.start();
         t.join(parameters.getTimeoutMilliseconds());
         synchronized(testState)
         {
             if(!testState.finished)
             {
-                status.timedOut();
                 t.stop();
+                status.timedOut();
             }
         }
         int expectedExitCode = 0;