test update: contiki shell prompt was changed

This commit is contained in:
fros4943 2010-03-29 10:52:22 +00:00
parent 9dfce4bea1
commit f228272cfc

View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<simconf> <simconf>
<project>../apps/mrm</project> <project EXPORT="discard">[CONTIKI_DIR]/tools/cooja/apps/mrm</project>
<project>../apps/mspsim</project> <project EXPORT="discard">[CONTIKI_DIR]/tools/cooja/apps/mspsim</project>
<project>../apps/avrora</project> <project EXPORT="discard">[CONTIKI_DIR]/tools/cooja/apps/avrora</project>
<project>../apps/native_gateway</project> <project EXPORT="discard">[CONTIKI_DIR]/tools/cooja/apps/native_gateway</project>
<simulation> <simulation>
<title>My simulation</title> <title>My simulation</title>
<delaytime>0</delaytime> <delaytime>0</delaytime>
@ -16,14 +16,17 @@
<success_ratio_tx>1.0</success_ratio_tx> <success_ratio_tx>1.0</success_ratio_tx>
<success_ratio_rx>1.0</success_ratio_rx> <success_ratio_rx>1.0</success_ratio_rx>
</radiomedium> </radiomedium>
<events>
<logoutput>40000</logoutput>
</events>
<motetype> <motetype>
se.sics.cooja.mspmote.SkyMoteType se.sics.cooja.mspmote.SkyMoteType
<identifier>sky1</identifier> <identifier>sky1</identifier>
<description>Sky Mote Type #1</description> <description>Sky Mote Type #1</description>
<source>../../../examples/sky-shell/sky-shell.c</source> <source EXPORT="discard">[CONTIKI_DIR]/examples/sky-shell/sky-shell.c</source>
<commands>make clean TARGET=sky <commands EXPORT="discard">make clean TARGET=sky
make sky-shell.sky TARGET=sky</commands> make sky-shell.sky TARGET=sky</commands>
<firmware>../../../examples/sky-shell/sky-shell.sky</firmware> <firmware EXPORT="copy">[CONTIKI_DIR]/examples/sky-shell/sky-shell.sky</firmware>
<moteinterface>se.sics.cooja.interfaces.Position</moteinterface> <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
<moteinterface>se.sics.cooja.interfaces.IPAddress</moteinterface> <moteinterface>se.sics.cooja.interfaces.IPAddress</moteinterface>
<moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface> <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
@ -32,12 +35,10 @@ make sky-shell.sky TARGET=sky</commands>
<moteinterface>se.sics.cooja.mspmote.interfaces.SkyButton</moteinterface> <moteinterface>se.sics.cooja.mspmote.interfaces.SkyButton</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.SkyFlash</moteinterface> <moteinterface>se.sics.cooja.mspmote.interfaces.SkyFlash</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.SkyByteRadio</moteinterface> <moteinterface>se.sics.cooja.mspmote.interfaces.SkyByteRadio</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.SkySerial</moteinterface> <moteinterface>se.sics.cooja.mspmote.interfaces.MspSerial</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.SkyLED</moteinterface> <moteinterface>se.sics.cooja.mspmote.interfaces.SkyLED</moteinterface>
</motetype> </motetype>
<mote> <mote>
se.sics.cooja.mspmote.SkyMote
<motetype_identifier>sky1</motetype_identifier>
<breakpoints /> <breakpoints />
<interface_config> <interface_config>
se.sics.cooja.interfaces.Position se.sics.cooja.interfaces.Position
@ -49,12 +50,13 @@ make sky-shell.sky TARGET=sky</commands>
se.sics.cooja.mspmote.interfaces.MspMoteID se.sics.cooja.mspmote.interfaces.MspMoteID
<id>1</id> <id>1</id>
</interface_config> </interface_config>
<motetype_identifier>sky1</motetype_identifier>
</mote> </mote>
</simulation> </simulation>
<plugin> <plugin>
se.sics.cooja.plugins.SimControl se.sics.cooja.plugins.SimControl
<width>302</width> <width>302</width>
<z>0</z> <z>2</z>
<height>204</height> <height>204</height>
<location_x>0</location_x> <location_x>0</location_x>
<location_y>0</location_y> <location_y>0</location_y>
@ -66,7 +68,7 @@ make sky-shell.sky TARGET=sky</commands>
<filter /> <filter />
</plugin_config> </plugin_config>
<width>690</width> <width>690</width>
<z>2</z> <z>1</z>
<height>190</height> <height>190</height>
<location_x>0</location_x> <location_x>0</location_x>
<location_y>457</location_y> <location_y>457</location_y>
@ -77,12 +79,12 @@ make sky-shell.sky TARGET=sky</commands>
<plugin_config> <plugin_config>
<script>TIMEOUT(2000, log.log("last message: " + msg + "\n")); <script>TIMEOUT(2000, log.log("last message: " + msg + "\n"));
WAIT_UNTIL(msg.startsWith('Contiki')); WAIT_UNTIL(msg.contains('Contiki'));
log.testOK();</script> log.testOK();</script>
<active>true</active> <active>true</active>
</plugin_config> </plugin_config>
<width>600</width> <width>600</width>
<z>1</z> <z>0</z>
<height>458</height> <height>458</height>
<location_x>300</location_x> <location_x>300</location_x>
<location_y>-1</location_y> <location_y>-1</location_y>