L2SDP-1036, now also for use in a jupyter notebook.

split init_sdtr.sh in several files, new init_sdptr for use in jupyter notebooks.

sdptr port is now always 4840 in production systems, in test systems where sdptr is not running in a docker --port=* can be used.

regressiontest/fw_regressiontest.sh

@@ -51,26 +51,22 @@ export TERM=xterm-256color
 #   . if [ -z "$PS1" ]; then return; fi. /home/regtest/git/radiohdl/regressiontest/modelsim_regression_test_vhdl_cron.sh
 #   This will stop sourcing of .bashrc immediately as a Cron job is not run interactively.
 ###############################################################################
-. "${HOME}"/.bashrc
+source "${HOME}"/.bashrc
 
 ssh-add "${HOME}"/.ssh/id_rsa
 
 # set sdptr
 INIT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"/../
-. "${INIT_DIR}"/init_sdptr.sh
+source "${INIT_DIR}"/init_sdptr_regressiontest.sh
 
-LOGDIR=${REGRESSIONTEST_DIR}/log
-LOGFILE=${LOGDIR}/fw_regressiontest.log
-MAILFILE=${REGRESSIONTEST_DIR}/log/fw_mail.txt
+LOGFILE=${REGRESSIONTEST_LOG_DIR}/fw_regressiontest.log
+MAILFILE=${REGRESSIONTEST_LOG_DIR}/fw_mail.txt
 TESTFILE=${REGRESSIONTEST_DIR}/fw_tests.txt
 EXPTESTFILE=${REGRESSIONTEST_DIR}/exp_fw_tests.txt
 EXPTESTFILE_CLEAN=${REGRESSIONTEST_DIR}/exp_fw_tests_clean.txt
 
-SDPTR_DIR=${HOME}/git/sdptr
-SDPTR_FILE=${HOME}/latest_pi_build/sdptr
 RADIOHDL_BUILD_RESULT=${HOME}/hdl_build_result
 
-
 # Delete any previous log file if it exist
 [[ -f "${LOGFILE}" ]] && rm "${LOGFILE}"
 
@@ -253,7 +249,7 @@ build_sdptr() {
 restart_sdp_translator() {
     echo "Restart SDP translator" >> ${MAILFILE}
     sdptr_restart_passed=
-    
+
     # stop sdptr and reload
     sdptr_exec "$0" restart_sdptr
     sleep 20
@@ -263,7 +259,7 @@ restart_sdp_translator() {
     sdp_version_str=$(sdp_rw.py --host "${sdptr_ip}" --port "${sdptr_port}" -r software_version)
     sdp_version=$(echo "${sdp_version_str}" | head -n1 | cut -d ":" -f2 | tr -d '[:space:]')
     echo "Running SDP translator version name: '${sdp_version}'"
-    
+
     if [[ "${sdp_version}" != *"None"* ]]; then
         sdptr_restart_passed="true"
     else
@@ -377,7 +373,7 @@ run_test() {
     while read -r line; do
         if [[ -n "${line}" ]]; then
             let "test_nr = test_nr + 1"
-            logfile_nr=${LOGDIR}/"test-${test_nr}.log"
+            logfile_nr=${REGRESSIONTEST_LOG_DIR}/"test-${test_nr}.log"
             echo "Run test ${test_nr}: ${line}"
             echo "Run test ${test_nr}: ${line}" >> ${MAILFILE}
             echo "${line}" > ${logfile_nr}
@@ -406,8 +402,8 @@ if [[ -n "${remote_ip}" ]]; then
     remote_args="--sdptr --sdptr-ip=${sdptr_ip} --sdptr-port=${sdptr_port} --rbf="${HOME}/latest_rbf_file/${rbf_filename}" --flash --test"
     sdptr_exec "$0" ssh -A -t "${remote_ip}" "${remote_cmd}" "${remote_args}"
     # get remote logfiles
-    sdptr_exec "$0" scp "${remote_ip}":"${LOGFILE}" "${LOGDIR}/remote_fw_regressiontest.log"
-    sdptr_exec "$0" scp "${remote_ip}":"${LOGDIR}/test-*.log" "${LOGDIR}/"
+    sdptr_exec "$0" scp "${remote_ip}":"${LOGFILE}" "${REGRESSIONTEST_LOG_DIR}/remote_fw_regressiontest.log"
+    sdptr_exec "$0" scp "${remote_ip}":"${REGRESSIONTEST_LOG_DIR}/test-*.log" "${REGRESSIONTEST_LOG_DIR}/"
     sdptr_exec "$0" scp "${remote_ip}":"${MAILFILE}" "${MAILFILE}"
 
 else
@@ -423,7 +419,7 @@ else
     restart_sdp_translator
     # check if all nodes are active, if sdptr is available
     [[ -n "${sdptr_restart_passed}" ]] && check_active_nodes
-    
+
     # run options only if sdptr is running and all nodes are available
     if [[ -n "${sdptr_restart_passed}" ]] && [[ -n "${nodes_check_passed}" ]]; then
         [[ -z "${flash}" ]] && reload_passed="false"
@@ -439,7 +435,7 @@ else
     fi
 
     # print build and/or run state on last rows
-    
+
     [[ "${sdptr_restart_passed}" = "true" ]] && echo "SDPTR-RESTART-PASSED" || echo "SDPTR-RESTART-FAILED"
     [[ "${nodes_check_passed}" = "true" ]] && echo "NODES-CHECK-PASSED" || echo "NODES-CHECK-FAILED"
 
@@ -456,7 +452,7 @@ else
     fi
 fi
 
-[[ "${test_passed}" = "true" ]] && echo "TEST-PASSED" > "${LOGDIR}/result.txt" || echo "TEST-FAILED" > "${LOGDIR}/result.txt"
+[[ "${test_passed}" = "true" ]] && echo "TEST-PASSED" > "${REGRESSIONTEST_LOG_DIR}/result.txt" || echo "TEST-FAILED" > "${REGRESSIONTEST_LOG_DIR}/result.txt"
 
 if [[ -n "${send_mail}" ]]; then
     sdptr_exec "$0" fw_regressiontest_mail.py --logfile "${LOGFILE}"