patch 7.4.1805

Problem:    Running tests in shadow dir fails.
Solution:   Link the samples directory

diff --git a/src/Makefile b/src/Makefile
index 19b147c76d1d835027b77c148f097a419195b9d8..b3b8daf0b1e2138065e2158745f50707186f3fdd 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -2608,6 +2608,7 @@ shadow:   runtime pixmaps
                                 ../../testdir/*.py \
                                 ../../testdir/python* \
                                 ../../testdir/sautest \
+                                ../../testdir/samples \
                                 ../../testdir/test83-tags? \
                                 ../../testdir/*.ok .
 

diff --git a/src/version.c b/src/version.c
index e891af900e88c8979fc0436b00e72639b7934726..86f38e6390d98c04fdb094f7126c1e47df4a005b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1805,
 /**/
     1804,
 /**/