Changeset: a517199587a3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a517199587a3
Modified Files:
clients/mapiclient/dotmonetdb.c
clients/mapiclient/tachograph.c
clients/mapiclient/tomograph.c
configure.ag
monetdb5/modules/mal/mdb.c
sql/test/BugTracker-2013/Tests/All
sql/test/BugTracker-2017/Tests/All
sql/test/BugTracker-2018/Tests/All
sql/test/BugTracker-2019/Tests/All
sql/test/Triggers/Tests/All
sql/test/emptydb-upgrade-chain-hge/Tests/All
sql/test/emptydb-upgrade-chain/Tests/All
sql/test/emptydb-upgrade/Tests/All
sql/test/mergetables/Tests/All
sql/test/wlcr/Tests/All
testing/Mtest.py.in
Branch: default
Log Message:
Merge with Apr2019 branch.
diffs (243 lines):
diff --git a/clients/mapiclient/dotmonetdb.c b/clients/mapiclient/dotmonetdb.c
--- a/clients/mapiclient/dotmonetdb.c
+++ b/clients/mapiclient/dotmonetdb.c
@@ -39,9 +39,9 @@ parse_dotmonetdb(char **user, char **pas
/* empty environment variable: skip the file */
cfile = NULL;
} else if ((config = fopen(cfile, "r")) == NULL) {
- cfile = NULL;
fprintf(stderr, "failed to open file '%s': %s\n",
cfile, strerror(errno));
+ cfile = NULL;
} else {
cfile = strdup(cfile);
}
diff --git a/clients/mapiclient/tachograph.c b/clients/mapiclient/tachograph.c
--- a/clients/mapiclient/tachograph.c
+++ b/clients/mapiclient/tachograph.c
@@ -261,7 +261,7 @@ update(EventRecord *ev)
if (starttime == 0) {
if (ev->fcn == 0 ) {
if (debug)
- fprintf(stderr, "Skip %s input
%s\n",(ev->state>=0?statenames[ev->state]:"unknown"),ev->fcn);
+ fprintf(stderr, "Skip %s
input\n",(ev->state>=0?statenames[ev->state]:"unknown"));
return;
}
if (debug)
diff --git a/clients/mapiclient/tomograph.c b/clients/mapiclient/tomograph.c
--- a/clients/mapiclient/tomograph.c
+++ b/clients/mapiclient/tomograph.c
@@ -1439,7 +1439,7 @@ update(char *line, EventRecord *ev)
if (starttime == 0) {
if (ev->fcn == 0 ) {
if (debug)
- fprintf(stderr, "Skip %s input
%s\n",(ev->state>=0?statenames[ev->state]:"unknown"),ev->fcn);
+ fprintf(stderr, "Skip %s
input\n",(ev->state>=0?statenames[ev->state]:"unknown"));
return;
}
if (debug)
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -2529,7 +2529,7 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
# checks for library functions
AS_CASE([$host],
- [*-darwin1[[01234567]]*], [
+ [*-darwin1[[012345678]]*], [
# OSX 10.6 (Snow Leopard) and up somehow makes
# configure believe that fdatasync exists, in
# reality however, it does not on this platform.
diff --git a/monetdb5/modules/mal/mdb.c b/monetdb5/modules/mal/mdb.c
--- a/monetdb5/modules/mal/mdb.c
+++ b/monetdb5/modules/mal/mdb.c
@@ -669,8 +669,7 @@ TBL_getdir(void)
BBPreclaim(b);
return NULL;
}
- strncpy(cur_dir, mod_path, l);
- cur_dir[l] = 0;
+ strncpy(cur_dir, mod_path, l + 1); /* including NULL
byte */
if ((mod_path = p) != NULL) {
while (*mod_path == PATH_SEP)
mod_path++;
diff --git a/sql/test/BugTracker-2013/Tests/All
b/sql/test/BugTracker-2013/Tests/All
--- a/sql/test/BugTracker-2013/Tests/All
+++ b/sql/test/BugTracker-2013/Tests/All
@@ -48,7 +48,7 @@ copy-into-compressed.Bug-3351
HAVE_LIBZ?copy-into-compressed-gz.Bug-3351
HAVE_LIBBZ2?copy-into-compressed-bz2.Bug-3351
median.Bug-3352
-check-constraint.Bug-3335
+KNOWNFAIL?check-constraint.Bug-3335
crash_after_creation_of_unique_key.Bug-3363
alter_resets_readonly.Bug-3362
env_errors.Bug-3370
diff --git a/sql/test/BugTracker-2017/Tests/All
b/sql/test/BugTracker-2017/Tests/All
--- a/sql/test/BugTracker-2017/Tests/All
+++ b/sql/test/BugTracker-2017/Tests/All
@@ -3,7 +3,7 @@ drop_system_schema.Bug-6437
check_system_schema.Bug-6437
unknown_col_in_order_by.Bug-3535
extract_quarter_week_from_date.Bug-3831
-insert_self_ref_FK.Bug-6131
+KNOWNFAIL?insert_self_ref_FK.Bug-6131
shutdown.Bug-6182
avggroupbysq.Bug-6178
semijoinunion.Bug-6150
@@ -105,7 +105,7 @@ sqlitelogictest-cast-decimal.Bug-6445
HAVE_LIBPY?table_returning_with.Bug-6444
insert_into_multiple_subqueries.Bug-6448
HAVE_SAMTOOLS?sqlsmith.Bug-6449
-HAVE_LIBPY?python_loader_clobbers_default_with_null.Bug-6464
+KNOWNFAIL&HAVE_LIBPY?python_loader_clobbers_default_with_null.Bug-6464
skip_problem_best_effort.Bug-6442
date_to_str.Bug-6467
cleanup_statistics.Bug-6439
diff --git a/sql/test/BugTracker-2018/Tests/All
b/sql/test/BugTracker-2018/Tests/All
--- a/sql/test/BugTracker-2018/Tests/All
+++ b/sql/test/BugTracker-2018/Tests/All
@@ -69,9 +69,9 @@ procedure-create-table.Bug-6604
sqlitelogictest-cast-null-not-in.Bug-6605
sqlitelogictest-groupby-coalesce-error-message.Bug-6608
sqlitelogictest-algebra-rangejoin-undefined.Bug-6610
-lateral-join-crash.Bug-6613
+KNOWNFAIL?lateral-join-crash.Bug-6613
dependency_column_on_sequence.Bug-6618
-local_replica_table_not_detected.Bug-6620
+KNOWNFAIL?local_replica_table_not_detected.Bug-6620
remote-table-where-not-equal.Bug-6621
groupby_having_orderby_count.Bug-6624
or_in_subselect.Bug-6625
diff --git a/sql/test/BugTracker-2019/Tests/All
b/sql/test/BugTracker-2019/Tests/All
--- a/sql/test/BugTracker-2019/Tests/All
+++ b/sql/test/BugTracker-2019/Tests/All
@@ -2,12 +2,12 @@ copy-into-from-stdin-empty-line.Bug-6669
HAVE_LIBR?r-date.Bug-6674
date_trunc
date_trunc_bulk
-subselect-contradiction.Bug-6683
+KNOWNFAIL?subselect-contradiction.Bug-6683
insert-replica-table.Bug-6684
-subselect-count.Bug-6686
-subselect.Bug-6688
+KNOWNFAIL?subselect-count.Bug-6686
+KNOWNFAIL?subselect.Bug-6688
timestamptransformation.Bug-6695
duplicates-not-eliminated-long-CASE-stmt.Bug-6697
-subselect.Bug-6700
+KNOWNFAIL?subselect.Bug-6700
alter_table_set_schema.Bug-6701
crash-in-rel_dependencies.Bug-6703
diff --git a/sql/test/Triggers/Tests/All b/sql/test/Triggers/Tests/All
--- a/sql/test/Triggers/Tests/All
+++ b/sql/test/Triggers/Tests/All
@@ -2,7 +2,7 @@ cascaded_triggers
recursive_triggers
referencing_clause_new
referencing_clause_old
-trigger_action
+KNOWNFAIL?trigger_action
trigger_activation
trigger_owner
triggers_schema_operations
diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/All
b/sql/test/emptydb-upgrade-chain-hge/Tests/All
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/All
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/All
@@ -2,4 +2,4 @@ HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&
HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_SAMTOOLS&HAVE_SHP&PREVHGECHAINRELEMPTY?upgrade
HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_SAMTOOLS&HAVE_SHP&PREVHGECHAINRELEMPTY&RELEASERUN?package
HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_SAMTOOLS&HAVE_SHP&PREVHGECHAINRELEMPTY?dump
-HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_PCRE&HAVE_SAMTOOLS&HAVE_SHP?check
+KNOWNFAIL&HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_PCRE&HAVE_SAMTOOLS&HAVE_SHP?check
diff --git a/sql/test/emptydb-upgrade-chain/Tests/All
b/sql/test/emptydb-upgrade-chain/Tests/All
--- a/sql/test/emptydb-upgrade-chain/Tests/All
+++ b/sql/test/emptydb-upgrade-chain/Tests/All
@@ -2,4 +2,4 @@ HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETC
HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_SAMTOOLS&HAVE_SHP&PREVCHAINRELEMPTY?upgrade
!HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_SAMTOOLS&HAVE_SHP&PREVCHAINRELEMPTY&RELEASERUN?package
HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_SAMTOOLS&HAVE_SHP&PREVCHAINRELEMPTY?dump
-HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_PCRE&HAVE_SAMTOOLS&HAVE_SHP?check
+KNOWNFAIL&HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_PCRE&HAVE_SAMTOOLS&HAVE_SHP?check
diff --git a/sql/test/emptydb-upgrade/Tests/All
b/sql/test/emptydb-upgrade/Tests/All
--- a/sql/test/emptydb-upgrade/Tests/All
+++ b/sql/test/emptydb-upgrade/Tests/All
@@ -1,4 +1,4 @@
HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_SAMTOOLS&HAVE_SHP&PREVRELEMPTY?unpackage
HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_SAMTOOLS&HAVE_SHP&PREVRELEMPTY?upgrade
HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_SAMTOOLS&HAVE_SHP&PREVRELEMPTY?dump
-HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_PCRE&HAVE_SAMTOOLS&HAVE_SHP&HAVE_SHP?check
+KNOWNFAIL&HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_NETCDF&HAVE_PCRE&HAVE_SAMTOOLS&HAVE_SHP&HAVE_SHP?check
diff --git a/sql/test/mergetables/Tests/All b/sql/test/mergetables/Tests/All
--- a/sql/test/mergetables/Tests/All
+++ b/sql/test/mergetables/Tests/All
@@ -15,7 +15,7 @@ mergedropcrash
mergedrop1
mergedrop2
mergemergeload
-singlekeyconstraint
+KNOWNFAIL?singlekeyconstraint
part-elim
mergedropcascade
addtable
diff --git a/sql/test/wlcr/Tests/All b/sql/test/wlcr/Tests/All
--- a/sql/test/wlcr/Tests/All
+++ b/sql/test/wlcr/Tests/All
@@ -22,7 +22,7 @@ wlr30
#delete some tupples
wlc40
-wlr40
+KNOWNFAIL?wlr40
#clear the complete table
wlc50
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -40,6 +40,7 @@ except ImportError:
except ImportError:
winreg = None # not on Windows
+MonetDB_VERSION = '@VERSION@'.split('.')
procdebug = False
verbose = False
@@ -421,6 +422,7 @@ CONDITIONALS = {
'PROFILING' : "@PROFILING_FALSE@",
# unknown at compile time;
# hence, we set them only at runtime in main() below
+ 'KNOWNFAIL' : "", # skip on release branch when not in testweb
'HAVE_MONETDBJDBC_JAR' : "",
'HAVE_JAVA' : "",
'HAVE_JAVAJDBC' : "",
@@ -2239,6 +2241,11 @@ def RunTest(env, TST, BusyPorts, COND, o
openutf8(TST+STABLEerr,"w").close()
ACCURACYerr = 0
errmissing = True
+ if (outmissing or errmissing) and not CONDITIONALS['KNOWNFAIL']:
+ # no stable output, so known to fail
+ reason = "as conditional 'KNOWNFAIL' does not hold."
+ elem = SkipTest(env, TST, EXT, reason, length)
+ return TX,Failed,Failed,elem,reason,links
PRELUDE = []
if EXT != '.sql':
@@ -3764,6 +3771,8 @@ def main(argv) :
'global timeout'),
('data_path', 'D', 'data_path', '<path>',
"Path to the root directory of the data files needed for
testing"),
+ ('alltests', None, 'alltests', None,
+ 'also run tests that are known to fail'),
]
if THISFILE == 'Mtest.py':
@@ -3817,6 +3826,8 @@ def main(argv) :
releaserun = opts.get('releaserun', releaserun)
nomito = opts.get('nomito', False)
CONDITIONALS['RELEASERUN'] = releaserun
+ if testweb or int(MonetDB_VERSION[1])%2 == 0 or opts.get('alltests',
False):
+ CONDITIONALS['KNOWNFAIL'] = 'execute'
jenkins = False
addreqs = False
all_tests = False
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
