# HG changeset patch # User Edouard Tisserant # Date 1645192614 -3600 # Node ID c2171d87b5877e6555e8808c8794b2e773f6d010 # Parent 67a4d207bace6a0a506b4f3ea3b682adf9d559d8 Documentation/comment fix. diff -r 67a4d207bace -r c2171d87b587 tests/Makefile --- a/tests/Makefile Fri Feb 18 14:51:58 2022 +0100 +++ b/tests/Makefile Fri Feb 18 14:56:54 2022 +0100 @@ -23,7 +23,7 @@ # $ make xnest_xterm # # run Xnest window with sikuli IDE and xterm -# $ make xnest_xterm +# $ make xnest_sikuli # # build minimal beremiz and matiec to run tests # $ make own_apps @@ -34,9 +34,6 @@ # $ make # # -# Variable $(src) is directory such that executed -# $(src)/beremiz/tests/Makefile is this file. -# # Test results, and other test byproducts are in $(test_dir), # $(test_dir) defaults to $(HOME)/test and can be overloaded: # $ make test_dir=${HOME}/other_test_dir @@ -45,7 +42,7 @@ # X server instance. This behavior can be overloaded # $ DISPLAY=:42 make xserver_command='echo "Using $DISPLAY X Server !";' # -# Matiec and Beremiz code are expected to be clean as if after hg clean --all. +# Matiec and Beremiz code are expected to be clean, ready to build # Any change in Matiec directory triggers rebuild of matiec. # Any change in Matiec and Beremiz directory triggers copy of source code # to $(test_dir)/build. @@ -59,7 +56,11 @@ all: source_check cli_tests ide_tests runtime_tests +# Variable $(src) is directory such that executed +# $(src)/Makefile is this file. src := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))) + +# $(workspace) is directory containing this project workspace ?= $(abspath $(src)/../..) test_dir ?= $(HOME)/test diff -r 67a4d207bace -r c2171d87b587 tests/ide_tests/sikuliberemiz.py --- a/tests/ide_tests/sikuliberemiz.py Fri Feb 18 14:51:58 2022 +0100 +++ b/tests/ide_tests/sikuliberemiz.py Fri Feb 18 14:56:54 2022 +0100 @@ -53,7 +53,7 @@ # window with no title only has 4 fields do describe it # beremiz splashcreen has no title - # we wity until main window is visible + # wait until main window is visible if len(wlist) == 1 and len(wlist[0]) == 5: windowID,_zero,wpid,_XID,wtitle = wlist[0] break diff -r 67a4d207bace -r c2171d87b587 tests/tools/Docker/beremiz-sikuli/create_docker_container.sh --- a/tests/tools/Docker/beremiz-sikuli/create_docker_container.sh Fri Feb 18 14:51:58 2022 +0100 +++ b/tests/tools/Docker/beremiz-sikuli/create_docker_container.sh Fri Feb 18 14:56:54 2022 +0100 @@ -14,11 +14,10 @@ UNAME=testing UHOME=/home/$UNAME -# define TESTDEBUG in env to enable dev-mode debug pasthrough -# for x11vnc and Xnest +# define TESTDEBUG in env to enable dev-mode debug pasthrough Xnest DEBUGARGS="-v /tmp/.X11-unix/X0:/tmp/.X11-unix/X0 -e DISPLAY=$DISPLAY" -# In case VNC with x11vnc is prefered, then a port should bepassed like this +# In case VNC with x11vnc is prefered, then a port should be passed like this # DEBUGARGS="-p 5900:5900" echo "Creating docker container"