X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Flibpspp%2Fsparse-xarray-test.at;h=52990ba5a23b6ad737d312f938db5d8bfe1d01fa;hb=1353faaa410617a7896e85a942e9900e9b3442e8;hp=00fa4fb00d513b41ddb039fac61097bbf0b43028;hpb=6c471f2f6675ed32e6d550adfda1106f1baf1421;p=pspp

diff --git a/tests/libpspp/sparse-xarray-test.at b/tests/libpspp/sparse-xarray-test.at
index 00fa4fb00d..52990ba5a2 100644
--- a/tests/libpspp/sparse-xarray-test.at
+++ b/tests/libpspp/sparse-xarray-test.at
@@ -1,16 +1,16 @@
 dnl PSPP - a program for statistical analysis.
 dnl Copyright (C) 2017 Free Software Foundation, Inc.
-dnl 
+dnl
 dnl This program is free software: you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
 dnl the Free Software Foundation, either version 3 of the License, or
 dnl (at your option) any later version.
-dnl 
+dnl
 dnl This program is distributed in the hope that it will be useful,
 dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
 dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 dnl GNU General Public License for more details.
-dnl 
+dnl
 dnl You should have received a copy of the GNU General Public License
 dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
 dnl
@@ -26,11 +26,11 @@ m4_divert_push([PREPARE_TESTS])
   case $OPEN_MAX in
     [0-9]*)
       # Divide by 2 because some fds are used by other code.
-      queue_limit=`expr $OPEN_MAX / 2` 
+      queue_limit=`expr $OPEN_MAX / 2`
       ;;
-    undefined) 
+    undefined)
       # Assume that any system with a dynamic fd limit has a large limit.
-      queue_limit=500 
+      queue_limit=500
       ;;
     *)
       case `uname -m 2>/dev/null` in
@@ -58,6 +58,7 @@ m4_divert_pop([PREPARE_TESTS])
 AT_SETUP([in-memory sparse_xarray])
 AT_KEYWORDS([slow])
 dnl --values=3 would be a slightly better test but takes much longer.
+ASAN_OPTIONS=$ASAN_OPTIONS:detect_odr_violation=0; export ASAN_OPTIONS
 AT_CHECK([sparse-xarray-test \
 	    --verbosity=0 --queue-limit=`sparse_xarray_queue_limit` \
 	    --columns=3 --max-rows=3 --max-memory-rows=3 --values=2],
@@ -67,6 +68,7 @@ AT_CLEANUP
 m4_define([SPARSE_XARRAY_ON_DISK],
   [AT_SETUP([on-disk sparse_xarray max-memory-rows=$1])
    AT_KEYWORDS([slow])
+   ASAN_OPTIONS=$ASAN_OPTIONS:detect_odr_violation=0; export ASAN_OPTIONS
    AT_CHECK([sparse-xarray-test \
 	       --verbosity=0 --queue-limit=`sparse_xarray_queue_limit` \
                --columns=2 --max-rows=3 --max-memory-rows=$1 --values=2],
@@ -78,6 +80,7 @@ SPARSE_XARRAY_ON_DISK([2])
 
 AT_SETUP([copying between in-memory sparse_xarrays])
 AT_KEYWORDS([sparse_xarray slow])
+ASAN_OPTIONS=$ASAN_OPTIONS:detect_odr_violation=0; export ASAN_OPTIONS
 AT_CHECK([sparse-xarray-test \
 	    --verbosity=0 --queue-limit=`sparse_xarray_queue_limit` \
  	    --columns=2 --max-rows=2 --max-memory-rows=2 --values=2 \
@@ -89,6 +92,7 @@ m4_define([SPARSE_XARRAY_COPY_DISK],
   [AT_SETUP([copying between on-disk sparse_xarrays max-memory-rows=$1])
    AT_KEYWORDS([sparse_xarray slow])
    limit=`sparse_xarray_queue_limit`
+   ASAN_OPTIONS=$ASAN_OPTIONS:detect_odr_violation=0; export ASAN_OPTIONS
    AT_CHECK([sparse-xarray-test \
                --verbosity=0 --queue-limit=`expr $limit / 2` \
 	       --columns=1 --max-rows=2 --max-memory-rows=$max_memory_rows \