tests: move pySim-prog test and its data into a sub directory

We currently have the shell script that performs the test in the
tests directory and the related data in pysim-testdata directory.
This is confusing, let's have evrything in a dedicated sub directory

Change-Id: Ic995a7f600d164fc0be3c2eb8255dbe043429bea
Related: OS#6531

contrib/jenkins.sh

@@ -9,7 +9,7 @@
 
 export PYTHONUNBUFFERED=1
 
-if [ ! -d "./pysim-testdata/" ] ; then
+if [ ! -d "./tests/" ] ; then
 	echo "###############################################"
 	echo "Please call from pySim-prog top directory"
 	echo "###############################################"
@@ -29,10 +29,10 @@ case "$JOB_TYPE" in
 	# Execute automatically discovered unit tests first
 	python -m unittest discover -v -s tests/unittests
 
-	# Run the test with physical cards
-	cd pysim-testdata
-	../tests/pySim-prog_test.sh
-	cd ..
+	# Run pySim-prog integration tests (requires physical cards)
+	cd tests/pySim-prog_test/
+        ./pySim-prog_test.sh
+	cd ../../
 
 	# Run pySim-trace test
 	tests/pySim-trace_test/pySim-trace_test.sh

tests/pySim-prog_test/pySim-prog_test.sh

@@ -20,8 +20,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-PYSIM_PROG=../pySim-prog.py
-PYSIM_READ=../pySim-read.py
+PYSIM_PROG=../../pySim-prog.py
+PYSIM_READ=../../pySim-read.py
 TEMPFILE=temp.tmp
 PYTHON=python3