From 7e87d0f971b0f78ca76028bcaba9215bd2a2e9ac Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Tue, 15 Apr 2003 13:19:41 +0000
Subject: [PATCH] Beanshell and Apache BSF don't like each other.  As the test
 is going to use Javascript anyway, the check whether scripting is available
 should do so, too.  In particular, the test will now checke whether Rhino is
 there, which the old test didn't.

Remove excess logging that lead me to think the test was failing
instead of skipped.


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274462 13f79535-47bb-0310-9956-ffa450edef68
---
 src/etc/testcases/filters/tokenfilter.xml                       | 2 +-
 src/testcases/org/apache/tools/ant/filters/TokenFilterTest.java | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/etc/testcases/filters/tokenfilter.xml b/src/etc/testcases/filters/tokenfilter.xml
index 59354e280..451d7044e 100644
--- a/src/etc/testcases/filters/tokenfilter.xml
+++ b/src/etc/testcases/filters/tokenfilter.xml
@@ -297,7 +297,7 @@
   </target>
 
   <target name="hasscript">
-    <script language="beanshell">
+    <script language="javascript">
       i = 1;
     </script>
   </target>
diff --git a/src/testcases/org/apache/tools/ant/filters/TokenFilterTest.java b/src/testcases/org/apache/tools/ant/filters/TokenFilterTest.java
index 691755610..2472a5b97 100644
--- a/src/testcases/org/apache/tools/ant/filters/TokenFilterTest.java
+++ b/src/testcases/org/apache/tools/ant/filters/TokenFilterTest.java
@@ -238,7 +238,6 @@ public class TokenFilterTest extends BuildFileTest {
         catch (Throwable ex) {
             System.out.println(
                 test + ": skipped - script not present ");
-            ex.printStackTrace(System.out);
             return false;
         }
         return true;