summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2018-06-27 09:52:10 +0200
committerAndy Wingo <wingo@pobox.com>2018-06-27 09:52:10 +0200
commitadf8d9353e8da1b70a6bcbd69d0e50559ffa650d (patch)
tree009878f40ae916367a919b253117cb54f90eb2a2
parent6eb473514966c4cbb61bbbf27bde5c9ca5fed850 (diff)
downloadguile-adf8d9353e8da1b70a6bcbd69d0e50559ffa650d.tar.gz
Remove mention of vm-error from test suite
* test-suite/test-suite/lib.scm (exception:vm-error): Remove. * test-suite/tests/strings.test: Remove override of exception:wrong-type-arg; not needed since a while ago.
-rw-r--r--test-suite/test-suite/lib.scm7
-rw-r--r--test-suite/tests/strings.test8
2 files changed, 4 insertions, 11 deletions
diff --git a/test-suite/test-suite/lib.scm b/test-suite/test-suite/lib.scm
index 5b73bdab3..b2cbb1faa 100644
--- a/test-suite/test-suite/lib.scm
+++ b/test-suite/test-suite/lib.scm
@@ -1,6 +1,6 @@
;;;; test-suite/lib.scm --- generic support for testing
-;;;; Copyright (C) 1999, 2000, 2001, 2004, 2006, 2007, 2009, 2010,
-;;;; 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
+;;;; Copyright (C) 1999-2001,2004,2006-2007,2009-2014,2018
+;;;; Free Software Foundation, Inc.
;;;;
;;;; This program is free software; you can redistribute it and/or
;;;; modify it under the terms of the GNU Lesser General Public
@@ -39,7 +39,6 @@
exception:string-contains-nul
exception:read-error
exception:null-pointer-error
- exception:vm-error
;; Reporting passes and failures.
run-test
@@ -294,8 +293,6 @@
(cons 'read-error "^.*$"))
(define exception:null-pointer-error
(cons 'null-pointer-error "^.*$"))
-(define exception:vm-error
- (cons 'vm-error "^.*$"))
;; as per throw in scm_to_locale_stringn()
(define exception:string-contains-nul
diff --git a/test-suite/tests/strings.test b/test-suite/tests/strings.test
index b404253ce..2bfb2b429 100644
--- a/test-suite/tests/strings.test
+++ b/test-suite/tests/strings.test
@@ -1,8 +1,8 @@
;;;; strings.test --- test suite for Guile's string functions -*- scheme -*-
;;;; Jim Blandy <jimb@red-bean.com> --- August 1999
;;;;
-;;;; Copyright (C) 1999, 2001, 2004-2006, 2008-2011, 2013,
-;;;; 2015 Free Software Foundation, Inc.
+;;;; Copyright (C) 1999,2001,2004-2006,2008-2011,2013,2015,2018
+;;;; Free Software Foundation, Inc.
;;;;
;;;; This library is free software; you can redistribute it and/or
;;;; modify it under the terms of the GNU Lesser General Public
@@ -26,10 +26,6 @@
(cons 'misc-error "^string is read-only"))
(define exception:illegal-escape
(cons 'read-error "illegal character in escape sequence"))
-;; Wrong types may have either the 'wrong-type-arg key when
-;; interpreted or 'vm-error when compiled. This matches both.
-(define exception:wrong-type-arg
- (cons #t "Wrong type"))
;; Create a string from integer char values, eg. (string-ints 65) => "A"
(define (string-ints . args)