X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Flibpspp%2Fsparse-xarray-test.at;h=6f00251f281ee6c9bb3f9b1d6f2615ab068f42e8;hb=794fc7f31c6748f0f19db7d9b5e8345f00db86c3;hp=4ff7d3d841423201a10c3fa8d5727f0660e8ed68;hpb=c874aedd39d85d49526cd90905b4fbbc8ef7a843;p=pspp

diff --git a/tests/libpspp/sparse-xarray-test.at b/tests/libpspp/sparse-xarray-test.at
index 4ff7d3d841..6f00251f28 100644
--- a/tests/libpspp/sparse-xarray-test.at
+++ b/tests/libpspp/sparse-xarray-test.at
@@ -1,3 +1,19 @@
+dnl PSPP - a program for statistical analysis.
+dnl Copyright (C) 2017 Free Software Foundation, Inc.
+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 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 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
 AT_BANNER([sparse external arrays])
 
 m4_divert_push([PREPARE_TESTS])
@@ -10,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
@@ -40,16 +56,18 @@ m4_divert_push([PREPARE_TESTS])
 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.
-AT_CHECK([sparse-xarray-test$EXEEXT \
+AT_CHECK([sparse-xarray-test \
 	    --verbosity=0 --queue-limit=`sparse_xarray_queue_limit` \
 	    --columns=3 --max-rows=3 --max-memory-rows=3 --values=2],
   [0], [ignore], [ignore])
 AT_CLEANUP
 
 m4_define([SPARSE_XARRAY_ON_DISK],
-  [AT_SETUP([on-disk sparse_xarray])
-   AT_CHECK([sparse-xarray-test$EXEEXT \
+  [AT_SETUP([on-disk sparse_xarray max-memory-rows=$1])
+   AT_KEYWORDS([slow])
+   AT_CHECK([sparse-xarray-test \
 	       --verbosity=0 --queue-limit=`sparse_xarray_queue_limit` \
                --columns=2 --max-rows=3 --max-memory-rows=$1 --values=2],
      [0], [ignore], [ignore])
@@ -59,8 +77,8 @@ SPARSE_XARRAY_ON_DISK([1])
 SPARSE_XARRAY_ON_DISK([2])
 
 AT_SETUP([copying between in-memory sparse_xarrays])
-AT_KEYWORDS([sparse_xarray])
-AT_CHECK([sparse-xarray-test$EXEEXT \
+AT_KEYWORDS([sparse_xarray slow])
+AT_CHECK([sparse-xarray-test \
 	    --verbosity=0 --queue-limit=`sparse_xarray_queue_limit` \
  	    --columns=2 --max-rows=2 --max-memory-rows=2 --values=2 \
 	    --xarrays=2 --no-write-rows --no-copy-columns],
@@ -68,10 +86,10 @@ AT_CHECK([sparse-xarray-test$EXEEXT \
 AT_CLEANUP
 
 m4_define([SPARSE_XARRAY_COPY_DISK],
-  [AT_SETUP([copying between on-disk sparse_xarrays])
-   AT_KEYWORDS([sparse_xarray])
+  [AT_SETUP([copying between on-disk sparse_xarrays max-memory-rows=$1])
+   AT_KEYWORDS([sparse_xarray slow])
    limit=`sparse_xarray_queue_limit`
-   AT_CHECK([sparse-xarray-test$EXEEXT \
+   AT_CHECK([sparse-xarray-test \
                --verbosity=0 --queue-limit=`expr $limit / 2` \
 	       --columns=1 --max-rows=2 --max-memory-rows=$max_memory_rows \
 	       --values=2 --xarrays=2 --no-write-rows --no-copy-columns],