Merge pull request #2926 from citusdata/normalize_all_the_tests

Normalize all tests
pull/2925/head
Philip Dubé 2019-09-03 21:10:40 +00:00 committed by GitHub
commit 077f5e26af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 59 deletions

View File

@ -29,22 +29,15 @@ then
DIFF=/usr/bin/diff
fi
grep -q "^$test$" $BASEDIR/normalized_tests.lst
grep_result=$?
if [ "$grep_result" -eq "0" ]
if test -z "$VANILLATEST"
then
sed -Ef $BASEDIR/normalize.sed < $file1 > $file1.modified
sed -Ef $BASEDIR/normalize.sed < $file2 > $file2.modified
$DIFF -w $args $file1.modified $file2.modified
exitcode=$?
rm -f $file1.modified $file2.modified
sed -Ef $BASEDIR/normalize.sed < $file1 > $file1.modified
sed -Ef $BASEDIR/normalize.sed < $file2 > $file2.modified
$DIFF -w $args $file1.modified $file2.modified
exitcode=$?
rm -f $file1.modified $file2.modified
exit $exitcode
else
# if test is not in normalized_tests.lst, just diff without normalizing.
$DIFF -w $args $file1 $file2
exitcode=$?
exec $DIFF -w $args $file1 $file2
fi
exit $exitcode

View File

@ -1,44 +0,0 @@
# List of tests whose output we want to normalize, one per line
custom_aggregate_support
failure_copy_on_hash
failure_real_time_select
failure_savepoints
failure_vacuum
foreign_key_restriction_enforcement
foreign_key_to_reference_table
intermediate_results
isolation_citus_dist_activity
isolation_ref2ref_foreign_keys
multi_alter_table_add_constraints
multi_alter_table_statements
multi_copy
multi_create_table_constraints
multi_explain
multi_foreign_key
multi_generate_ddl_commands
multi_having_pushdown
multi_insert_select
multi_insert_select_conflict
multi_join_order_tpch_small
multi_join_pruning
multi_master_protocol
multi_metadata_sync
multi_modifying_xacts
multi_multiuser
multi_mx_explain
multi_name_lengths
multi_null_minmax_value_pruning
multi_orderby_limit_pushdown
multi_partitioning
multi_partitioning_utils
multi_partition_pruning
multi_reference_table
multi_select_distinct
multi_subquery_window_functions
multi_subtransactions
multi_task_assignment_policy
multi_view
sql_procedure
window_functions
worker_check_invalid_arguments

View File

@ -810,6 +810,7 @@ if ($vanillatest)
$ENV{PGHOST} = $host;
$ENV{PGPORT} = $masterPort;
$ENV{PGUSER} = $user;
$ENV{VANILLATEST} = "1";
if (-f "$vanillaSchedule")
{