Changeset: dc43f1815445 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/dc43f1815445
Modified Files:
monetdb5/mal/Tests/All
Branch: Jun2023
Log Message:
Merge with Sep2022 branch.
diffs (164 lines):
diff --git a/monetdb5/mal/Tests/All b/monetdb5/mal/Tests/All
--- a/monetdb5/mal/Tests/All
+++ b/monetdb5/mal/Tests/All
@@ -189,3 +189,4 @@ pithole
malids
# Tracer
# # tracer00 Output is call dependent
+HAVE_HGE?mal_int128
diff --git a/sql/test/mapi/Tests/mal_int128.maltest
b/monetdb5/mal/Tests/mal_int128.maltest
rename from sql/test/mapi/Tests/mal_int128.maltest
rename to monetdb5/mal/Tests/mal_int128.maltest
diff --git a/sql/backends/monet5/UDF/capi/Tests/All
b/sql/backends/monet5/UDF/capi/Tests/All
--- a/sql/backends/monet5/UDF/capi/Tests/All
+++ b/sql/backends/monet5/UDF/capi/Tests/All
@@ -1,20 +1,20 @@
-NOT_WIN32?capi00
-NOT_WIN32?capi01
-NOT_WIN32?capi02
-NOT_WIN32?capi03
-NOT_WIN32?capi04
-NOT_WIN32?capi05
-NOT_WIN32&HAVE_CPP?capi06
-NOT_WIN32?capi07
-NOT_WIN32?capi08
-NOT_WIN32?capi09
-NOT_WIN32?capi10
-NOT_WIN32?capi11
-#NOT_WIN32?capi12 no oids
-NOT_WIN32?capi13
-NOT_WIN32?capi14
-NOT_WIN32?capi15
-NOT_WIN32?capi16
-NOT_WIN32?capi17
-NOT_WIN32?capi18
+HAVE_CUDF?capi00
+HAVE_CUDF?capi01
+HAVE_CUDF?capi02
+HAVE_CUDF?capi03
+HAVE_CUDF?capi04
+HAVE_CUDF?capi05
+HAVE_CUDF&HAVE_CPP?capi06
+HAVE_CUDF?capi07
+HAVE_CUDF?capi08
+HAVE_CUDF?capi09
+HAVE_CUDF?capi10
+HAVE_CUDF?capi11
+#HAVE_CUDF?capi12 no oids
+HAVE_CUDF?capi13
+HAVE_CUDF?capi14
+HAVE_CUDF?capi15
+HAVE_CUDF?capi16
+HAVE_CUDF?capi17
+HAVE_CUDF?capi18
diff --git a/sql/test/mapi/Tests/All b/sql/test/mapi/Tests/All
--- a/sql/test/mapi/Tests/All
+++ b/sql/test/mapi/Tests/All
@@ -5,7 +5,6 @@ smack00
smack01
python3_dbapi
utf8test
-HAVE_HGE?mal_int128
HAVE_HGE?sql_int128
HAVE_HGE?python3_int128
HAVE_HGE?sql_dec38
diff --git a/sql/test/mapi/Tests/mal_int128.mal.test
b/sql/test/mapi/Tests/mal_int128.mal.test
deleted file mode 100644
--- a/sql/test/mapi/Tests/mal_int128.mal.test
+++ /dev/null
@@ -1,70 +0,0 @@
-statement ok
-a:hge := 1234567890987654321:hge
-
-statement ok
-b:hge := 10000000000:hge
-
-statement ok
-c:hge := calc.*(a,b)
-
-statement ok
-d:hge := calc.*(c,b)
-
-statement ok
-e:hge := calc.+(d,a)
-
-query T rowsort
-io.print(a)
-----
-1234567890987654321
-
-query T rowsort
-io.print(b)
-----
-10000000000
-
-query T rowsort
-io.print(c)
-----
-12345678909876543210000000000
-
-query T rowsort
-io.print(d)
-----
-123456789098765432100000000000000000000
-
-query T rowsort
-io.print(e)
-----
-123456789098765432101234567890987654321
-
-query T rowsort
-io.print(123456789098765432101234567890987654321)
-----
-123456789098765432101234567890987654321
-
-query T rowsort
-io.print(123456789098765432101234567890987654321H)
-----
-123456789098765432101234567890987654321
-
-query T rowsort
-io.print(123456789098765432101234567890987654321:hge)
-----
-123456789098765432101234567890987654321
-
-statement ok
-z := bat.new(:hge)
-
-statement ok
-z := bat.append(z,123456789098765432101234567890987654321)
-
-statement ok
-z := bat.append(z,123456789098765432101234567890987654321H)
-
-statement ok
-z := bat.append(z,123456789098765432101234567890987654321:hge)
-
-statement error
-io.print(z)
-
diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
--- a/testing/CMakeLists.txt
+++ b/testing/CMakeLists.txt
@@ -37,6 +37,9 @@ set(QXSOURCE "${CMAKE_SOURCE_DIR}")
set(QXsysconfdir "${CMAKE_INSTALL_FULL_SYSCONFDIR}")
set(SOURCE "${CMAKE_SOURCE_DIR}")
+if (HAVE_CUDF)
+ set(HAVE_CUDF_FALSE "#")
+endif(HAVE_CUDF)
if (HAVE_CURL)
set(HAVE_CURL_FALSE "#")
endif(HAVE_CURL)
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -362,6 +362,7 @@ CONDITIONALS = {
# from configure.ag:
# These should cover all AM_CONDITIONALS defined in configure.ag, i.e.,
# `grep AM_CONDITIONAL configure.ag | sed
's|^AM_CONDITIONAL(\([^,]*\),.*$|\1|' | sort -u`
+ 'HAVE_CUDF' : "@HAVE_CUDF_FALSE@",
'HAVE_CURL' : "@HAVE_CURL_FALSE@",
'HAVE_FITS' : "@HAVE_FITS_FALSE@",
'HAVE_GEOM' : "@HAVE_GEOM_FALSE@",
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
