Mercurial Mercurial > beremiz / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
tests/tools/run_python_tests.sh
author Andrey Skvortsov <andrej.skvortzov@gmail.com>
Wed, 01 Aug 2018 13:09:45 +0300
changeset 2258 c9915bc620cd
parent 1825 bcb50e736a46
child 2435 925adaa2cd5c
permissions -rwxr-xr-x
Fix wrong code generation if EN/ENO are used in FBD/LD/SFC

This problem appears for example here

--------
------- | MOVE |
| MOVE1 |------|EN ENO|
------- | |
| |
------- | | -----------
| 23 |------|IN OUT|---| LocalVar0 |
------- -------- -----------


--------
------- | MOVE |
| MOVE2 |------|EN ENO|
------- | |
| |
------- | | -----------
| 15 |------|IN OUT|---| LocalVar0 |
------- -------- -----------

Before wrong code was generated for this case:

MOVE6_OUT := MOVE(EN := move1, IN := 23, ENO => MOVE6_ENO);
LocalVar0 := MOVE6_OUT;
MOVE4_OUT := MOVE(EN := move2, IN := 15, ENO => MOVE4_ENO);
LocalVar0 := MOVE4_OUT;

With this patch now following code is generated:

MOVE6_OUT := MOVE(EN := move1, IN := 23, ENO => MOVE6_ENO);
IF MOVE6_ENO THEN
LocalVar0 := MOVE6_OUT;
END_IF;
MOVE4_OUT := MOVE(EN := move2, IN := 15, ENO => MOVE4_ENO);
IF MOVE4_ENO THEN
LocalVar0 := MOVE4_OUT;
END_IF;


See discussion here:
https://sourceforge.net/p/beremiz/mailman/message/36378805/
1820
76f5eba31afd add shell script to run all python tests and automatically handle Xvfb
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
diff changeset 
     1
 
#!/bin/sh
76f5eba31afd add shell script to run all python tests and automatically handle Xvfb
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
diff changeset 
     2
 







1825






bcb50e736a46
run python tests with non-english locale to catch bugs related to localization



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 
1820

diff
changeset




     3


LC_ALL=ru_RU.utf-8








1820






76f5eba31afd
add shell script to run all python tests and automatically handle Xvfb



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 

diff
changeset




     4














76f5eba31afd
add shell script to run all python tests and automatically handle Xvfb



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 

diff
changeset




     5


export DISPLAY=:42













76f5eba31afd
add shell script to run all python tests and automatically handle Xvfb



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 

diff
changeset




     6


Xvfb $DISPLAY -screen 0 1280x1024x24 &













76f5eba31afd
add shell script to run all python tests and automatically handle Xvfb



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 

diff
changeset




     7


sleep 1













76f5eba31afd
add shell script to run all python tests and automatically handle Xvfb



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 

diff
changeset




     8














76f5eba31afd
add shell script to run all python tests and automatically handle Xvfb



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 

diff
changeset




     9


ret=0













76f5eba31afd
add shell script to run all python tests and automatically handle Xvfb



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 

diff
changeset




    10


DELAY=400













76f5eba31afd
add shell script to run all python tests and automatically handle Xvfb



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 

diff
changeset




    11


KILL_DELAY=$(($DELAY + 30))













76f5eba31afd
add shell script to run all python tests and automatically handle Xvfb



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 

diff
changeset




    12


timeout -k $KILL_DELAY $DELAY pytest --timeout=10 ./tests/tools













76f5eba31afd
add shell script to run all python tests and automatically handle Xvfb



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 

diff
changeset




    13


ret=$?













76f5eba31afd
add shell script to run all python tests and automatically handle Xvfb



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 

diff
changeset




    14














76f5eba31afd
add shell script to run all python tests and automatically handle Xvfb



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 

diff
changeset




    15


pkill -9 Xvfb













76f5eba31afd
add shell script to run all python tests and automatically handle Xvfb



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 

diff
changeset




    16














76f5eba31afd
add shell script to run all python tests and automatically handle Xvfb



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 

diff
changeset




    17


exit $ret













beremiz