deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

more output after running scripts

Browse source
This commit is contained in:
fros4943 2008-09-18 14:24:46 +00:00
parent f6f5637f4f
commit 673d0e8f12
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tools/cooja/java/se/sics/cooja/GUI.java
View file

@ -24,7 +24,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: GUI.java,v 1.78 2008/09/18 14:04:13 fros4943 Exp $ * $Id: GUI.java,v 1.79 2008/09/18 14:24:46 fros4943 Exp $
*/ */
package se.sics.cooja; package se.sics.cooja;
@ -3112,6 +3112,7 @@ public class GUI extends Observable {
/* Activate test */ /* Activate test */
scriptPlugin.activateTest(configFile, scriptFile, logFile); scriptPlugin.activateTest(configFile, scriptFile, logFile);
System.exit(1);
} }
} }
}); });

5
tools/cooja/java/se/sics/cooja/plugins/ScriptRunnerNoGUI.java
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: ScriptRunnerNoGUI.java,v 1.1 2008/04/22 13:05:18 fros4943 Exp $ * $Id: ScriptRunnerNoGUI.java,v 1.2 2008/09/18 14:24:46 fros4943 Exp $
*/ */
package se.sics.cooja.plugins; package se.sics.cooja.plugins;
@ -170,10 +170,13 @@ public class ScriptRunnerNoGUI implements Plugin {
/* Start simulation and leave control to script */ /* Start simulation and leave control to script */
sim.startSimulation(); sim.startSimulation();
} catch (IOException e) { } catch (IOException e) {
logger.fatal("Error when running script: " + e);
return false; return false;
} catch (UnsatisfiedLinkError e) { } catch (UnsatisfiedLinkError e) {
logger.fatal("Error when running script: " + e);
return false; return false;
} catch (SimulationCreationException e) { } catch (SimulationCreationException e) {
logger.fatal("Error when running script: " + e);
return false; return false;
} }