Tests: re-introduce xvfb+x11vnc target in Makefile : xvfb_sikuli wxPython4
authorEdouard Tisserant <edouard.tisserant@gmail.com>
Mon, 28 Feb 2022 21:46:37 +0100
branchwxPython4
changeset 3435 c17155fd8573
parent 3434 1402d5c0e27e
child 3436 ccaabb9da623
Tests: re-introduce xvfb+x11vnc target in Makefile : xvfb_sikuli
tests/Makefile
tests/tools/Docker/beremiz-sikuli/create_docker_container.sh
--- a/tests/Makefile	Mon Feb 28 21:29:46 2022 +0100
+++ b/tests/Makefile	Mon Feb 28 21:46:37 2022 +0100
@@ -138,7 +138,7 @@
 $(foreach idetest,$(ide_tests),$(eval $(call make_idetest_rule,$(idetest))))
 
 ide_tests : $(ide_tests_targets)
-	echo "$(ide_tests_targets)" : Passed
+	echo "$(ide_tests_targets) : Passed"
 
 xnest_xterm: own_apps
 	$(call xnest_run, bash -c '(fluxbox &);xterm')
@@ -146,10 +146,13 @@
 xnest_sikuli: own_apps
 	$(call xnest_run, bash -c '(fluxbox &);(BEREMIZPATH=$(build_dir)/beremiz xterm -e sikulix &);xterm')
 
-
-# in case VNC would be used 
-	#xvfb-run -s '-screen 0 1920x1080x24' bash -c '(fluxbox &);(x11vnc &);xterm;'
-
+xvfb_sikuli: own_apps
+	echo "******************************************"
+	echo "On host, run 'xvncviewer 127.0.0.1:5900' to see sikuli X session"
+	echo "Docker container must be created with TESTDEBUG=YES. For example :"
+	echo "./clean_docker_container.sh && ./build_docker_image.sh && TESTDEBUG=YES ./create_docker_container.sh && ./build_in_docker.sh xvfb_sikuli"
+	echo "******************************************"
+	$(xserver_command) bash -c '(fluxbox &);(x11vnc &);(BEREMIZPATH=$(build_dir)/beremiz xterm -e sikulix &);xterm'
 
 clean:
 	rm -rf $(ide_tests_targets) $(build_dir)
--- a/tests/tools/Docker/beremiz-sikuli/create_docker_container.sh	Mon Feb 28 21:29:46 2022 +0100
+++ b/tests/tools/Docker/beremiz-sikuli/create_docker_container.sh	Mon Feb 28 21:46:37 2022 +0100
@@ -14,11 +14,10 @@
 UNAME=testing
 UHOME=/home/$UNAME
 
-# 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 be passed like this
-# DEBUGARGS="-p 5900:5900"
+# define TESTDEBUG in env to enable dev-mode. This enables :
+#   - debug pasthrough for Xnest
+#   - VNC port passthrough
+DEBUGARGS="-v /tmp/.X11-unix/X0:/tmp/.X11-unix/X0 -e DISPLAY=$DISPLAY -p 5900:5900"
 
 echo "Creating docker container"
 docker create \