Changeset: 2c5e263ba047 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2c5e263ba047 Modified Files: clients/Tests/All sql/jdbc/tests/Tests/All sql/test/BugTracker-2011/Tests/All sql/test/BugTracker-2012/Tests/All sql/test/Dependencies/Tests/All sql/test/Tests/All sql/test/bugs/Tests/All sql/test/leaks/Tests/All Branch: Oct2014 Log Message:
Add !ENABLE_DATACELL condition to tests whose output change with datacell. diffs (211 lines): diff --git a/clients/Tests/All b/clients/Tests/All --- a/clients/Tests/All +++ b/clients/Tests/All @@ -1,9 +1,9 @@ exports -HAVE_CFITSIO&HAVE_GEOM&HAVE_GSL&HAVE_LIBR&HAVE_SAMTOOLS&HAVE_SPHINXCLIENT?MAL-signatures_all -HAVE_CFITSIO&HAVE_GEOM&!HAVE_GSL&!HAVE_LIBR&!HAVE_SAMTOOLS&!HAVE_SPHINXCLIENT?MAL-signatures_fits_geom -!HAVE_CFITSIO&HAVE_GEOM&!HAVE_GSL&!HAVE_LIBR&!HAVE_SAMTOOLS&!HAVE_SPHINXCLIENT?MAL-signatures_geom -!HAVE_CFITSIO&!HAVE_GEOM&!HAVE_GSL&!HAVE_LIBR&!HAVE_SAMTOOLS&!HAVE_SPHINXCLIENT?MAL-signatures_none -HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS?SQL-dump_all -HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS?SQL-dump_geom -!HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS?SQL-dump_none +HAVE_CFITSIO&HAVE_GEOM&HAVE_GSL&HAVE_LIBR&HAVE_SAMTOOLS&HAVE_SPHINXCLIENT&!ENABLE_DATACELL?MAL-signatures_all +HAVE_CFITSIO&HAVE_GEOM&!HAVE_GSL&!HAVE_LIBR&!HAVE_SAMTOOLS&!HAVE_SPHINXCLIENT&!ENABLE_DATACELL?MAL-signatures_fits_geom +!HAVE_CFITSIO&HAVE_GEOM&!HAVE_GSL&!HAVE_LIBR&!HAVE_SAMTOOLS&!HAVE_SPHINXCLIENT&!ENABLE_DATACELL?MAL-signatures_geom +!HAVE_CFITSIO&!HAVE_GEOM&!HAVE_GSL&!HAVE_LIBR&!HAVE_SAMTOOLS&!HAVE_SPHINXCLIENT&!ENABLE_DATACELL?MAL-signatures_none +HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS&!ENABLE_DATACELL?SQL-dump_all +HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS&!ENABLE_DATACELL?SQL-dump_geom +!HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS&!ENABLE_DATACELL?SQL-dump_none MERCURIAL?malcheck diff --git a/sql/jdbc/tests/Tests/All b/sql/jdbc/tests/Tests/All --- a/sql/jdbc/tests/Tests/All +++ b/sql/jdbc/tests/Tests/All @@ -5,8 +5,8 @@ HAVE_JDBCTESTS?Test_Creplysize HAVE_JDBCTESTS?Test_Csavepoints HAVE_JDBCTESTS?Test_Ctransaction #HAVE_JDBCTESTS?Test_Csendthread # unfortunately has runtime-dependant output -HAVE_JDBCTESTS&!HAVE_SAMTOOLS?Test_Dobjects -HAVE_JDBCTESTS&HAVE_SAMTOOLS?Test_Dobjects_bam +HAVE_JDBCTESTS&!HAVE_SAMTOOLS&!ENABLE_DATACELL?Test_Dobjects +HAVE_JDBCTESTS&HAVE_SAMTOOLS&!ENABLE_DATACELL?Test_Dobjects_bam HAVE_JDBCTESTS?Test_PSgeneratedkeys HAVE_JDBCTESTS?Test_PSsomeamount HAVE_JDBCTESTS?Test_PSlargebatchval diff --git a/sql/test/BugTracker-2011/Tests/All b/sql/test/BugTracker-2011/Tests/All --- a/sql/test/BugTracker-2011/Tests/All +++ b/sql/test/BugTracker-2011/Tests/All @@ -25,7 +25,7 @@ CASE_division_exception.Bug-2822 nested_SELECT_UNIAL_ALL.Bug-2816 subquery_in_where.Bug-2823 func_iter_vs_bulk.Bug-2826 -UDF_in_schema.Bug-2817 +!ENABLE_DATACELL?UDF_in_schema.Bug-2817 with-scope.Bug-2058 blob-update-crash.Bug-2832 select_value_insert_into.Bug-2845 diff --git a/sql/test/BugTracker-2012/Tests/All b/sql/test/BugTracker-2012/Tests/All --- a/sql/test/BugTracker-2012/Tests/All +++ b/sql/test/BugTracker-2012/Tests/All @@ -29,10 +29,10 @@ name_resolution_in_proc.Bug-3074 segfault_incorrect_head.Bug-3028 cast_varchar_to_double.Bug-3071 table_returning_func_returns_too_many_columns.Bug-3077 -!HAVE_SAMTOOLS?table_functions_fail_after_restart-0.Bug-3063 -HAVE_SAMTOOLS?table_functions_fail_after_restart-0.Bug-3063_bam -!HAVE_SAMTOOLS?table_functions_fail_after_restart-1.Bug-3063 -HAVE_SAMTOOLS?table_functions_fail_after_restart-1.Bug-3063_bam +!HAVE_SAMTOOLS&!ENABLE_DATACELL?table_functions_fail_after_restart-0.Bug-3063 +HAVE_SAMTOOLS&!ENABLE_DATACELL?table_functions_fail_after_restart-0.Bug-3063_bam +!HAVE_SAMTOOLS&!ENABLE_DATACELL?table_functions_fail_after_restart-1.Bug-3063 +HAVE_SAMTOOLS&!ENABLE_DATACELL?table_functions_fail_after_restart-1.Bug-3063_bam user_defined_decimal_function.Bug-2992 non_keyword_no.Bug-3079 round-type-inference.Bug-2987 diff --git a/sql/test/Dependencies/Tests/All b/sql/test/Dependencies/Tests/All --- a/sql/test/Dependencies/Tests/All +++ b/sql/test/Dependencies/Tests/All @@ -1,3 +1,3 @@ -!HAVE_SAMTOOLS?Dependencies -HAVE_SAMTOOLS?Dependencies_bam +!HAVE_SAMTOOLS&!ENABLE_DATACELL?Dependencies +HAVE_SAMTOOLS&!ENABLE_DATACELL?Dependencies_bam dependency_loop diff --git a/sql/test/Tests/All b/sql/test/Tests/All --- a/sql/test/Tests/All +++ b/sql/test/Tests/All @@ -1,7 +1,7 @@ -HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS?systemfunctions -HAVE_GEOM&HAVE_GSL&!HAVE_SAMTOOLS?systemfunctions_gsl -HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS?systemfunctions_bam -!HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS?systemfunctions_nogeom +HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS&!ENABLE_DATACELL?systemfunctions +HAVE_GEOM&HAVE_GSL&!HAVE_SAMTOOLS&!ENABLE_DATACELL?systemfunctions_gsl +HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS&!ENABLE_DATACELL?systemfunctions_bam +!HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS&!ENABLE_DATACELL?systemfunctions_nogeom example example-queries example-drop @@ -89,7 +89,7 @@ procedure_syntax order_by_simple_exp order_by_complex_exp -setoptimizer +!ENABLE_DATACELL?setoptimizer string #NOT_WIN32?crashme bug #1825 50ways diff --git a/sql/test/bugs/Tests/All b/sql/test/bugs/Tests/All --- a/sql/test/bugs/Tests/All +++ b/sql/test/bugs/Tests/All @@ -9,8 +9,8 @@ bug-sf-938733 union_all-bug-sf-941788 subselect_single_value-bug-sf-941791 subselect_union-bug-sf-941826 -!HAVE_SAMTOOLS?groupby_having_charlength-bug-sf-943566 -HAVE_SAMTOOLS?groupby_having_charlength-bug-sf-943566_bam +!HAVE_SAMTOOLS&!ENABLE_DATACELL?groupby_having_charlength-bug-sf-943566 +HAVE_SAMTOOLS&!ENABLE_DATACELL?groupby_having_charlength-bug-sf-943566_bam innerjoin_multiple-bug-sf-943661 groupby_having-bug-sf-947600 subselect_ambigious_columns-bug-sf-949071 diff --git a/sql/test/leaks/Tests/All b/sql/test/leaks/Tests/All --- a/sql/test/leaks/Tests/All +++ b/sql/test/leaks/Tests/All @@ -1,48 +1,48 @@ -HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS?check0 -HAVE_GEOM&HAVE_GSL&!HAVE_SAMTOOLS?check0_gsl -HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS?check0_bam -!HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS?check0_nogeom -HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS?check1 -HAVE_GEOM&HAVE_GSL&!HAVE_SAMTOOLS?check1_gsl -HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS?check1_bam -!HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS?check1_nogeom -HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS?temp1 -HAVE_GEOM&HAVE_GSL&!HAVE_SAMTOOLS?temp1_gsl -HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS?temp1_bam -!HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS?temp1_nogeom -HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS?check2 -HAVE_GEOM&HAVE_GSL&!HAVE_SAMTOOLS?check2_gsl -HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS?check2_bam -!HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS?check2_nogeom -HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS?temp2 -HAVE_GEOM&HAVE_GSL&!HAVE_SAMTOOLS?temp2_gsl -HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS?temp2_bam -!HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS?temp2_nogeom -HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS?check3 -HAVE_GEOM&HAVE_GSL&!HAVE_SAMTOOLS?check3_gsl -HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS?check3_bam -!HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS?check3_nogeom -HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS?temp3 -HAVE_GEOM&HAVE_GSL&!HAVE_SAMTOOLS?temp3_gsl -HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS?temp3_bam -!HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS?temp3_nogeom -HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS?drop3 -HAVE_GEOM&HAVE_GSL&!HAVE_SAMTOOLS?drop3_gsl -HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS?drop3_bam -!HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS?drop3_nogeom -HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS?check4 -HAVE_GEOM&HAVE_GSL&!HAVE_SAMTOOLS?check4_gsl -HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS?check4_bam -!HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS?check4_nogeom -HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS?check5 -HAVE_GEOM&HAVE_GSL&!HAVE_SAMTOOLS?check5_gsl -HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS?check5_bam -!HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS?check5_nogeom -HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS?select1 -HAVE_GEOM&HAVE_GSL&!HAVE_SAMTOOLS?select1_gsl -HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS?select1_bam -!HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS?select1_nogeom -HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS?select2 -HAVE_GEOM&HAVE_GSL&!HAVE_SAMTOOLS?select2_gsl -HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS?select2_bam -!HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS?select2_nogeom +HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS&!ENABLE_DATACELL?check0 +HAVE_GEOM&HAVE_GSL&!HAVE_SAMTOOLS&!ENABLE_DATACELL?check0_gsl +HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS&!ENABLE_DATACELL?check0_bam +!HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS&!ENABLE_DATACELL?check0_nogeom +HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS&!ENABLE_DATACELL?check1 +HAVE_GEOM&HAVE_GSL&!HAVE_SAMTOOLS&!ENABLE_DATACELL?check1_gsl +HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS&!ENABLE_DATACELL?check1_bam +!HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS&!ENABLE_DATACELL?check1_nogeom +HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS&!ENABLE_DATACELL?temp1 +HAVE_GEOM&HAVE_GSL&!HAVE_SAMTOOLS&!ENABLE_DATACELL?temp1_gsl +HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS&!ENABLE_DATACELL?temp1_bam +!HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS&!ENABLE_DATACELL?temp1_nogeom +HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS&!ENABLE_DATACELL?check2 +HAVE_GEOM&HAVE_GSL&!HAVE_SAMTOOLS&!ENABLE_DATACELL?check2_gsl +HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS&!ENABLE_DATACELL?check2_bam +!HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS&!ENABLE_DATACELL?check2_nogeom +HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS&!ENABLE_DATACELL?temp2 +HAVE_GEOM&HAVE_GSL&!HAVE_SAMTOOLS&!ENABLE_DATACELL?temp2_gsl +HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS&!ENABLE_DATACELL?temp2_bam +!HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS&!ENABLE_DATACELL?temp2_nogeom +HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS&!ENABLE_DATACELL?check3 +HAVE_GEOM&HAVE_GSL&!HAVE_SAMTOOLS&!ENABLE_DATACELL?check3_gsl +HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS&!ENABLE_DATACELL?check3_bam +!HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS&!ENABLE_DATACELL?check3_nogeom +HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS&!ENABLE_DATACELL?temp3 +HAVE_GEOM&HAVE_GSL&!HAVE_SAMTOOLS&!ENABLE_DATACELL?temp3_gsl +HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS&!ENABLE_DATACELL?temp3_bam +!HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS&!ENABLE_DATACELL?temp3_nogeom +HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS&!ENABLE_DATACELL?drop3 +HAVE_GEOM&HAVE_GSL&!HAVE_SAMTOOLS&!ENABLE_DATACELL?drop3_gsl +HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS&!ENABLE_DATACELL?drop3_bam +!HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS&!ENABLE_DATACELL?drop3_nogeom +HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS&!ENABLE_DATACELL?check4 +HAVE_GEOM&HAVE_GSL&!HAVE_SAMTOOLS&!ENABLE_DATACELL?check4_gsl +HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS&!ENABLE_DATACELL?check4_bam +!HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS&!ENABLE_DATACELL?check4_nogeom +HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS&!ENABLE_DATACELL?check5 +HAVE_GEOM&HAVE_GSL&!HAVE_SAMTOOLS&!ENABLE_DATACELL?check5_gsl +HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS&!ENABLE_DATACELL?check5_bam +!HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS&!ENABLE_DATACELL?check5_nogeom +HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS&!ENABLE_DATACELL?select1 +HAVE_GEOM&HAVE_GSL&!HAVE_SAMTOOLS&!ENABLE_DATACELL?select1_gsl +HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS&!ENABLE_DATACELL?select1_bam +!HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS&!ENABLE_DATACELL?select1_nogeom +HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS&!ENABLE_DATACELL?select2 +HAVE_GEOM&HAVE_GSL&!HAVE_SAMTOOLS&!ENABLE_DATACELL?select2_gsl +HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS&!ENABLE_DATACELL?select2_bam +!HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS&!ENABLE_DATACELL?select2_nogeom _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
