Changeset: a47a239f9895 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/a47a239f9895
Modified Files:
        clients/Tests/All
        clients/Tests/melcheck.sh
Branch: default
Log Message:

Run test clients/melcheck also when in a Git checkout


diffs (28 lines):

diff --git a/clients/Tests/All b/clients/Tests/All
--- a/clients/Tests/All
+++ b/clients/Tests/All
@@ -1,6 +1,6 @@
 exports
 
HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_LIBR&HAVE_LIBPY3&HAVE_NETCDF&HAVE_SHP&NOT_WIN32?MAL-signatures-hge
 
!HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_LIBR&HAVE_LIBPY3&HAVE_NETCDF&HAVE_SHP&NOT_WIN32?MAL-signatures
-NOT_WIN32&MERCURIAL?melcheck
+NOT_WIN32&melcheck
 mclient-uri
 testcondvar
diff --git a/clients/Tests/melcheck.sh b/clients/Tests/melcheck.sh
--- a/clients/Tests/melcheck.sh
+++ b/clients/Tests/melcheck.sh
@@ -1,3 +1,12 @@
 #!/bin/sh
 cd $TSTSRCBASE
-hg -q files -I '{monetdb5,sql,geom}/**.[ch]' -X '**/Tests/**' | python3 -c 
'import MonetDBtesting.melcheck'
+
+hg_root="$(hg root 2>/dev/null)"
+git_root="$(git rev-parse --show-toplevel 2>/dev/null)"
+
+if [ "$hg_root" = "$TSTSRCBASE" ]; then
+       hg -q files -I '{monetdb5,sql,geom}/**.[ch]' -X '**/Tests/**'
+elif [ "$git_root" = "$TSTSRCBASE" ]; then
+       git ls-files -- 'monetdb5/**.[ch]' 'sql/**.[ch]' 'geom/**.[ch]' 
':!:**/Tests/*'
+fi \
+| python3 -c 'import MonetDBtesting.melcheck'
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org

Reply via email to