[Jnode-svn-commits] SF.net SVN: jnode:[5373] trunk/shell/src

[<cr...@us...>]

Revision: 5373
          http://jnode.svn.sourceforge.net/jnode/?rev=5373&view=rev
Author:   crawley
Date:     2009-04-30 14:11:06 +0000 (Thu, 30 Apr 2009)

Log Message:
-----------
Starting to get black-box tests running again after reorg.

Modified Paths:
--------------
    trunk/shell/src/emu/org/jnode/emu/Emu.java
    trunk/shell/src/test/org/jnode/test/shell/all-tests.xml
    trunk/shell/src/test/org/jnode/test/shell/bjorne/bjorne-builtin-tests.xml
    trunk/shell/src/test/org/jnode/test/shell/bjorne/bjorne-shell-tests.xml

Modified: trunk/shell/src/emu/org/jnode/emu/Emu.java
===================================================================
--- trunk/shell/src/emu/org/jnode/emu/Emu.java	2009-04-30 12:27:53 UTC (rev 5372)
+++ trunk/shell/src/emu/org/jnode/emu/Emu.java	2009-04-30 14:11:06 UTC (rev 5373)
@@ -55,13 +55,21 @@
  * @author cr...@jn...
  */
 public class Emu {
-    private static final String[] ALL_PROJECTS = new String[]{
-        "core", "distr", "fs", "gui", "net", "shell", "sound", "textui"
+	// FIXME configuring a hard-coded list of projects is a bad idea.
+	private static final String[] ALL_PROJECTS = new String[]{
+        "cli", "core", "distr", "fs", "gui", "net", "shell", "sound", "textui"
     };
 
     // FIXME configuring a hard-coded list of command plugins is a bad idea.
     private static final String[] DEFAULT_PLUGIN_IDS = new String[] {
-        "org.jnode.shell.command",
+        "org.jnode.command.archive",
+        "org.jnode.command.common",
+        "org.jnode.command.dev.ant",
+        "org.jnode.command.dev",
+        "org.jnode.command.file",
+        "org.jnode.command.net",
+        "org.jnode.command.system",
+        "org.jnode.command.util",
         "org.jnode.shell.command.driver.console",
         "org.jnode.apps.editor",
         "org.jnode.apps.edit",

Modified: trunk/shell/src/test/org/jnode/test/shell/all-tests.xml
===================================================================
--- trunk/shell/src/test/org/jnode/test/shell/all-tests.xml	2009-04-30 12:27:53 UTC (rev 5372)
+++ trunk/shell/src/test/org/jnode/test/shell/all-tests.xml	2009-04-30 14:11:06 UTC (rev 5373)
@@ -1,8 +1,8 @@
 <testSet title="All shell tests">
     <include setName="bjorne/bjorne-shell-tests.xml"/>
     <include setName="bjorne/bjorne-builtin-tests.xml"/>
-    <include setName="command/posix/posix-command-tests.xml"/>
-    <include setName="command/posix/basename-command-tests.xml"/>
-    <include setName="command/posix/dirname-command-tests.xml"/>
-    <include setName="command/posix/wc-command-tests.xml"/>
+<!--    <include setName="command/posix/posix-command-tests.xml"/>-->
+<!--    <include setName="command/posix/basename-command-tests.xml"/>-->
+<!--    <include setName="command/posix/dirname-command-tests.xml"/>-->
+<!--    <include setName="command/posix/wc-command-tests.xml"/>-->
 </testSet>

Modified: trunk/shell/src/test/org/jnode/test/shell/bjorne/bjorne-builtin-tests.xml
===================================================================
--- trunk/shell/src/test/org/jnode/test/shell/bjorne/bjorne-builtin-tests.xml	2009-04-30 12:27:53 UTC (rev 5372)
+++ trunk/shell/src/test/org/jnode/test/shell/bjorne/bjorne-builtin-tests.xml	2009-04-30 14:11:06 UTC (rev 5373)
@@ -1,6 +1,6 @@
 <testSet title="Bjorne interpreter tests">
     <plugin id="org.jnode.shell.bjorne" class="org.jnode.test.shell.bjorne.BjornePseudoPlugin"/>
-    <plugin id="org.jnode.shell.command.posix"/>
+    <plugin id="org.jnode.command.common"/>
     <testSpec title="exit 0" command="test" runMode="AS_SCRIPT" rc="0">
         <script>#!bjorne
                 exit 0

Modified: trunk/shell/src/test/org/jnode/test/shell/bjorne/bjorne-shell-tests.xml
===================================================================
--- trunk/shell/src/test/org/jnode/test/shell/bjorne/bjorne-shell-tests.xml	2009-04-30 12:27:53 UTC (rev 5372)
+++ trunk/shell/src/test/org/jnode/test/shell/bjorne/bjorne-shell-tests.xml	2009-04-30 14:11:06 UTC (rev 5373)
@@ -1,7 +1,7 @@
 <testSet title="Bjorne interpreter tests">
     <plugin id="org.jnode.shell.bjorne" class="org.jnode.test.shell.bjorne.BjornePseudoPlugin"/>
-    <plugin id="org.jnode.shell.command.posix"/>
-    <plugin id="org.jnode.fs.command"/>
+    <plugin id="org.jnode.command.common"/>
+    <plugin id="org.jnode.command.file"/>
     <testSpec title="simple" command="test" runMode="AS_SCRIPT" rc="0">
         <script>#!bjorne
 echo HI


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.