funkey/FunKey-OS
1
0
Fork 0
mirror of https://github.com/FunKey-Project/FunKey-OS.git synced 2025-12-12 15:48:51 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed assembly tests issues

Browse Source
This commit is contained in:
Vincent-FK 2021-01-19 01:33:44 +01:00
parent d472581e8c
commit d802c7a257
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
FunKey/board/funkey/rootfs-overlay/usr/local/sbin/assembly_tests
View File

@ -44,9 +44,6 @@ function function_magnet_detected_ok {
## Kill scheduled shutdown ## Kill scheduled shutdown
pkill sched_shutdown pkill sched_shutdown
## Kill the funkey_prod_screen binary
killall -s USR1 "${PROD_SCREEN_BIN} > /dev/null 2>&1
## Write magnet_detected file ## Write magnet_detected file
if $test_failed; then if $test_failed; then
echo "1" > $MAGNET_DETECTED_FILE echo "1" > $MAGNET_DETECTED_FILE
@ -67,7 +64,7 @@ function function_magnet_detected_ko {
echo "ERROR: Caught SIGUSR1 signal (magnet detected!)" echo "ERROR: Caught SIGUSR1 signal (magnet detected!)"
## Kill the funkey_prod_screen binary ## Kill the funkey_prod_screen binary
killall -s USR1 "${PROD_SCREEN_BIN} > /dev/null 2>&1 killall -s USR1 "${PROD_SCREEN_BIN}" > /dev/null 2>&1
sync sync
} }
@ -223,7 +220,7 @@ function launch_tests_up_until_magnet {
sync sync
# Catch SIGUSR1 events # Catch SIGUSR1 events
trap function_magnet_detected_ok SIGUSR1 #trap function_magnet_detected_ok SIGUSR1
## Launch prod screen test magnet ## Launch prod screen test magnet
echo "TEST MAGNET:" echo "TEST MAGNET:"
@ -231,8 +228,15 @@ function launch_tests_up_until_magnet {
$PROD_SCREEN_BIN MAGNET 2>&1 $PROD_SCREEN_BIN MAGNET 2>&1
res="$?" res="$?"
echo " $res" echo " $res"
## Register ourself back as the running FunKey task for receiving USR1
## signal for shutting down
echo $$ > "/var/run/funkey.pid"
# check magnet test result
if [[ "$res" == "0" ]]; then if [[ "$res" == "0" ]]; then
echo " OK" echo " OK"
function_magnet_detected_ok
else else
echo " FAILED" echo " FAILED"
test_failed=true test_failed=true

2
FunKey/package/ProdScreens/ProdScreens.mk
View File

@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
PRODSCREENS_VERSION = FunKey-ProdScreens-FunKey-1.1.0 PRODSCREENS_VERSION = FunKey-ProdScreens-FunKey-1.1.1
PRODSCREENS_SITE_METHOD = git PRODSCREENS_SITE_METHOD = git
PRODSCREENS_SITE = https://github.com/FunKey-Project/FunKey-ProdScreens.git PRODSCREENS_SITE = https://github.com/FunKey-Project/FunKey-ProdScreens.git
PRODSCREENS_SITE_LICENSE = GPL-2.1+ PRODSCREENS_SITE_LICENSE = GPL-2.1+