From: Ben Pfaff <blp@cs.stanford.edu>
Date: Thu, 20 Feb 2014 16:33:21 +0000 (-0800)
Subject: sys-file-reader: Don't skip "too many value labels" test anymore.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp;a=commitdiff_plain;h=bb4738b6612729d1d3f83009e88505ffc8c46e2d

sys-file-reader: Don't skip "too many value labels" test anymore.

Previously the maximum number of value labels depended on the size of
size_t, so that it was impossible to have too many on 64-bit systems, but
a recent change made the maximum number of value labels depend on the
size of unsigned int instead, so now 32- and 64-bit systems are the same.
This commit reverts the code that skips the test.
---

diff --git a/configure.ac b/configure.ac
index 7ec5a0231a..4b91e73098 100644
--- a/configure.ac
+++ b/configure.ac
@@ -305,10 +305,6 @@ gl_INIT
 
 AC_C_INLINE
 
-AC_CHECK_SIZEOF([size_t])
-SIZEOF_SIZE_T=$ac_cv_sizeof_size_t
-AC_SUBST([SIZEOF_SIZE_T])
-
 AC_C_BIGENDIAN
 
 AC_CHECK_FUNCS([__setfpucw fork execl isinf isnan finite getpid feholdexcept fpsetmask popen round])
diff --git a/tests/atlocal.in b/tests/atlocal.in
index 7c23b79662..fae659ae3d 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -7,7 +7,6 @@ ODF_READ_SUPPORT='@ODF_READ_SUPPORT@'
 PERL='@PERL@'
 WITH_PERL_MODULE='@WITH_PERL_MODULE@'
 host='@host@'
-SIZEOF_SIZE_T='@SIZEOF_SIZE_T@'
 
 PSQL_SUPPORT='@PSQL_SUPPORT@'
 if test "$PSQL_SUPPORT" = yes; then
diff --git a/tests/data/sys-file-reader.at b/tests/data/sys-file-reader.at
index c63e751f23..7291e836e6 100644
--- a/tests/data/sys-file-reader.at
+++ b/tests/data/sys-file-reader.at
@@ -3124,9 +3124,6 @@ done
 AT_CLEANUP
 
 AT_SETUP([too many value labels])
-dnl Skip the test if multiplying a small number by INT32_MAX would not
-dnl cause an overflow in size_t.
-AT_SKIP_IF([test $SIZEOF_SIZE_T -gt 4])
 AT_KEYWORDS([sack synthetic system file negative])
 AT_DATA([sys-file.sack], [dnl
 dnl File header.