Commit 67c9922c authored by Theodor-Adrian Stana's avatar Theodor-Adrian Stana

sw: Updated test order and prepared pts.py for flash test

parent 2e84587f
......@@ -9,15 +9,15 @@ all:
cp -r shell/ pts-conv-ttl-rs485/
cp pts-conv-ttl-rs485/shell/program pts-conv-ttl-rs485/boot
cp pts-conv-ttl-rs485/shell/flash pts-conv-ttl-rs485/boot
cp python/pts.py pts-conv-ttl-rs485
cp python/jpts.py pts-conv-ttl-rs485
cp python/vv_pts.py pts-conv-ttl-rs485/lib/
cp python/ptsexcept.py pts-conv-ttl-rs485/lib/
cp python/pts.py pts-conv-ttl-rs485
cp python/jpts.py pts-conv-ttl-rs485
cp python/vv_pts.py pts-conv-ttl-rs485/lib/
cp python/ptsexcept.py pts-conv-ttl-rs485/lib/
cp python/ptsdefine.py pts-conv-ttl-rs485/lib/
sed -i "s/ELMAIP = \"\"/ELMAIP = \"$(ELMAIP)\"/" pts-conv-ttl-rs485/lib/ptsdefine.py
sed -i "s/ELMAPWD = \"\"/ELMAPWD = \"$(ELMAPWD)\"/" pts-conv-ttl-rs485/lib/ptsdefine.py
sed -i "s/ELMASLOT = 4/ELMASLOT = $(ELMASLOT)/" pts-conv-ttl-rs485/lib/ptsdefine.py
sed -i "s/ELMAIP = \"\"/ELMAIP = \"$(ELMAIP)\"/" pts-conv-ttl-rs485/lib/ptsdefine.py
sed -i "s/ELMAPWD = \"\"/ELMAPWD = \"$(ELMAPWD)\"/" pts-conv-ttl-rs485/lib/ptsdefine.py
sed -i "s/ELMASLOT = 4/ELMASLOT = $(ELMASLOT)/" pts-conv-ttl-rs485/lib/ptsdefine.py
cp python/leds.py pts-conv-ttl-rs485/tests/
cp python/dac_vcxo_pll.py pts-conv-ttl-rs485/tests/
......@@ -25,15 +25,14 @@ all:
cp python/ttl_pulse_switch.py pts-conv-ttl-rs485/tests/
cp python/sfp_eeprom.py pts-conv-ttl-rs485/tests/
cp python/sfp_test.py pts-conv-ttl-rs485/tests/
cp python/flash.py pts-conv-ttl-rs485/tests/
cp python/flashtest.py pts-conv-ttl-rs485/
ln -s tests/dac_vcxo_pll.py pts-conv-ttl-rs485/test01.py
ln -s tests/therm_id.py pts-conv-ttl-rs485/test02.py
ln -s tests/ttl_pulse_switch.py pts-conv-ttl-rs485/test03.py
ln -s tests/sfp_eeprom.py pts-conv-ttl-rs485/test04.py
ln -s tests/sfp_test.py pts-conv-ttl-rs485/test05.py
ln -s tests/leds.py pts-conv-ttl-rs485/test06.py
ln -s tests/flash.py pts-conv-ttl-rs485/test08.py
ln -s tests/sfp_eeprom.py pts-conv-ttl-rs485/test05.py
ln -s tests/sfp_test.py pts-conv-ttl-rs485/test06.py
ln -s tests/leds.py pts-conv-ttl-rs485/test07.py
wget -P pts-conv-ttl-rs485/boot http://www.ohwr.org/attachments/download/3648/pts.bit
wget -P pts-conv-ttl-rs485/boot http://www.ohwr.org/attachments/download/3650/flash_load.bit
......
......@@ -180,8 +180,7 @@ if __name__ == '__main__':
# After JPTS has finished, download release bitstream to EEPROM chip if none of the tests has failed
print "Loading CONV-TTL-RS485 golden and release bitstream...\n"
ret = subprocess.call("cd boot; ./flash", shell=True, stdout=sys.stdout,
stderr=sys.stderr)
ret = subprocess.call("cd boot; ./flash", shell=True, stdout=fnull, stderr=fnull)
if (ret != 0):
print "ERROR: Bitstream download failed"
else:
......@@ -196,7 +195,7 @@ if __name__ == '__main__':
time.sleep(5)
# .. and run the flash test
cmd = "./test08.py"
cmd = "python ./flashtest.py"
subprocess.call(cmd, shell=True, stdout=fnull, stderr=fnull)
# After all testing has finished, grep the log files for PASS and FAIL messages and print the outcomes to the console
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment