X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Flanguage%2Fdata-io%2Fmatch-files.at;h=d83eec8e48d759c21549cb169dbf1cc776b2f04f;hb=bde476f0e660baabf9a409b600edf864750f10b4;hp=2cca5213a942ba80222515df4d0e5a6e60428e52;hpb=3384b8f946b446e849bad1bc7aad238b2e0a9691;p=pspp

diff --git a/tests/language/data-io/match-files.at b/tests/language/data-io/match-files.at
index 2cca5213a9..d83eec8e48 100644
--- a/tests/language/data-io/match-files.at
+++ b/tests/language/data-io/match-files.at
@@ -134,8 +134,8 @@ a,b,c,d,e,f
 ])
 AT_CLEANUP
 
-dnl Test bug handling TABLE from active file found by John Darrington.
-AT_SETUP([MATCH FILES bug with TABLE from active file])
+dnl Test bug handling TABLE from active dataset found by John Darrington.
+AT_SETUP([MATCH FILES bug with TABLE from active dataset])
 AT_DATA([match-files.sps], [dnl
 DATA LIST LIST NOTABLE /x * y *.
 BEGIN DATA
@@ -198,3 +198,33 @@ x,y,j
 2.00,3.00,55.00
 ])
 AT_CLEANUP
+
+dnl Tests for a bug that caused MATCH FILES to crash
+dnl with incompatible variables, especially but not
+dnl exclusively when one variable came from the active
+dnl file.
+AT_SETUP([MATCH FILES with incompatible variable types])
+AT_DATA([match-files.sps], [dnl
+DATA LIST LIST NOTABLE/name (A6) x.
+BEGIN DATA.
+al,7
+brad,8
+carl,9
+END DATA.
+SAVE OUTFILE='x.sav'.
+
+DATA LIST LIST NOTABLE/name (A7) y.
+BEGIN DATA.
+al,1
+carl,2
+dan,3
+END DATA.
+MATCH FILES/FILE='x.sav'/FILE=*/BY name.
+LIST.
+])
+AT_CHECK([pspp -O format=csv match-files.sps], [1], [dnl
+"match-files.sps:15: error: MATCH FILES: Variable name in file * has different type or width from the same variable in earlier file.  In file *, name is a string variable with width 7.  In an earlier file, name was a string variable with width 6."
+
+match-files.sps:16: error: Stopping syntax file processing here to avoid a cascade of dependent command failures.
+])
+AT_CLEANUP