Changeset: b65dbfd1a870 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/b65dbfd1a870
Branch: default
Log Message:
Merge with Sep2022 branch.
diffs (57 lines):
diff --git a/common/utils/sha.h b/common/utils/sha.h
--- a/common/utils/sha.h
+++ b/common/utils/sha.h
@@ -160,7 +160,6 @@ typedef struct SHA256Context {
int Corrupted; /* Cumulative corruption code */
} SHA256Context;
-#define USE_32BIT_ONLY
/*
* This structure will hold context information for the SHA-512
* hashing operation.
diff --git a/sql/jdbc/tests/Tests/JDBC_API_Tester.SQL.py
b/sql/jdbc/tests/Tests/JDBC_API_Tester.SQL.py
--- a/sql/jdbc/tests/Tests/JDBC_API_Tester.SQL.py
+++ b/sql/jdbc/tests/Tests/JDBC_API_Tester.SQL.py
@@ -10,7 +10,7 @@ USER='monetdb'
PASSWORD='monetdb'
JDBC_EXTRA_ARGS=os.getenv('JDBC_EXTRA_ARGS', default='')
-URL=f"jdbc:monetdb://{HOST}:{MAPIPORT}/{TSTDB}?user=monetdb&password=monetdb{JDBC_EXTRA_ARGS}"
+URL=f"jdbc:monetdb://{HOST}:{MAPIPORT}/{TSTDB}?user={USER}&password={PASSWORD}{JDBC_EXTRA_ARGS}"
cmd = ['java', 'JDBC_API_Tester', URL]
try:
diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
--- a/testing/CMakeLists.txt
+++ b/testing/CMakeLists.txt
@@ -138,30 +138,6 @@ if(PYTHON3_LIBDIR)
utils.py
DESTINATION ${PYTHON3_LIBDIR}/MonetDBtesting
COMPONENT pytesting)
-
- if(BUILD_TESTING_PACKAGE)
- set(pypackagedir "${CMAKE_BINARY_DIR}/pytesting/src")
- make_directory("${pypackagedir}/MonetDBtesting")
- install(FILES
- process.py
- __init__.py
- ${CMAKE_CURRENT_BINARY_DIR}/listexports.py
- exportutils.py
- melcheck.py
- sqllogictest.py
- explain.py
- mapicursor.py
- malmapi.py
- helpers.py
- sqltest.py
- utils.py
- DESTINATION "${pypackagedir}/MonetDBtesting")
-
- configure_file(pyproject.toml.in
- "${pypackagedir}/pyproject.toml"
- @ONLY)
-
- endif()
endif()
if(WIN32)
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
