From ee77d6a1a9862b4bbcb04eb7d649ea7e80beed5e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Kochma=C5=84ski?= Date: Wed, 2 Sep 2015 09:33:16 +0200 Subject: [PATCH] tests: adjust files MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel Kochmański --- src/tests/bugs/doit.lsp | 43 +++++------------------ src/tests/bugs/tests/compiler.lsp | 1 + src/tests/bugs/tests/external-formats.lsp | 57 +++++++++++++++++-------------- 3 files changed, 41 insertions(+), 60 deletions(-) diff --git a/src/tests/bugs/doit.lsp b/src/tests/bugs/doit.lsp index a2eef86..1f191c6 100644 --- a/src/tests/bugs/doit.lsp +++ b/src/tests/bugs/doit.lsp @@ -29,48 +29,23 @@ (load "universe.lsp") (load "ansi-aux.lsp") -(load "test-ansi.lsp") -(load "sf262--declaim-type-foo-setf-foo.lsp") -(load "sf272--style-warning-argument-order.lsp") -(load "sf276--write-hash-readably.lsp") -(load "sf282--mvb-not-evaled.lsp") -(load "sf286.lsp") - -(load "cl-001.lsp") - -(load "mixed.lsp") - -(load "int-001.lsp") +(load "tests/test-ansi.lsp") +(load "tests/mixed.lsp") +(load "tests/compiler.lsp") #-ecl-bytecmp -(load "cmp-001.lsp") - -#+clos (progn - (load "mop-001.lsp") - (load "mop-dispatch.lsp") - (load "mop-dependents.lsp")) + (load "tests/embedding.lsp") + #+ffi (load "tests/foreign-interface.lsp")) -#+(and ffi (not ecl-bytecmp)) -(load "ffi-001.lsp") +#+clos +(load "tests/metaobject-protocol.lsp") #+threads -(progn - (load "mp-tools.lsp") - (load "mp-001.lsp") - (load "mutex-001.lsp") - (load "mailbox-001.lsp") - ) +(load "tests/multiprocessing.lsp") #+unicode -(progn - ;; In Windows SYSTEM does not fail with a nonzero code when it - ;; fails to execute a command. Hence in that case we assume - ;; we simply can not run these tests - #-msvc - (when (zerop (si::system "iconv -l >/dev/null 2>&1")) - (load "eformat-002.lsp")) - (load "eformat-001.lsp")) +(load "tests/external-formats.lsp") ;; (setf sb-rt::*expected-failures* ;; (nconc sb-rt::*expected-failures* diff --git a/src/tests/bugs/tests/compiler.lsp b/src/tests/bugs/tests/compiler.lsp index 7aaee27..404cd48 100644 --- a/src/tests/bugs/tests/compiler.lsp +++ b/src/tests/bugs/tests/compiler.lsp @@ -979,6 +979,7 @@ ;;; of a mismatch between the position of the fields bytecodes.entry ;;; and cfun.entry ;;; +#-ecl-bytcmp (deftest compiler.0041.bytecodes-entry-position (let ((indices (funcall (compile nil '(lambda () diff --git a/src/tests/bugs/tests/external-formats.lsp b/src/tests/bugs/tests/external-formats.lsp index abefe51..f20cede 100644 --- a/src/tests/bugs/tests/external-formats.lsp +++ b/src/tests/bugs/tests/external-formats.lsp @@ -301,37 +301,42 @@ about each individual comparison if VERBOSE is true." ;;; Test external formats by transcoding random sequences of characters using ;;; ECL and iconv. ;;; -(deftest external-format.simple-iconv-check - (loop for name in '(:ISO-8859-1 :ISO-8859-2 :ISO-8859-3 :ISO-8859-4 - :ISO-8859-5 :ISO-8859-6 :ISO-8859-7 :ISO-8859-8 - :ISO-8859-9 :ISO-8859-10 :ISO-8859-11 :ISO-8859-13 - :ISO-8859-14 :ISO-8859-15 :ISO-8859-16 +#-msvc +;; In Windows SYSTEM does not fail with a nonzero code when it +;; fails to execute a command. Hence in that case we assume +;; we simply can not run these tests +(when (zerop (si::system "iconv -l >/dev/null 2>&1")) + (deftest external-format.simple-iconv-check + (loop for name in '(:ISO-8859-1 :ISO-8859-2 :ISO-8859-3 :ISO-8859-4 + :ISO-8859-5 :ISO-8859-6 :ISO-8859-7 :ISO-8859-8 + :ISO-8859-9 :ISO-8859-10 :ISO-8859-11 :ISO-8859-13 + :ISO-8859-14 :ISO-8859-15 :ISO-8859-16 - :KOI8-R :KOI8-U + :KOI8-R :KOI8-U - :IBM437 :IBM850 :IBM852 :IBM855 :IBM857 :IBM860 - :IBM861 :IBM862 :IBM863 :IBM864 :IBM865 :IBM866 - :IBM869 + :IBM437 :IBM850 :IBM852 :IBM855 :IBM857 :IBM860 + :IBM861 :IBM862 :IBM863 :IBM864 :IBM865 :IBM866 + :IBM869 - :CP936 :CP949 :CP950 + :CP936 :CP949 :CP950 - :WINDOWS-1250 :WINDOWS-1251 :WINDOWS-1252 :WINDOWS-1253 - :WINDOWS-1254 :WINDOWS-1256 :WINDOWS-1257 + :WINDOWS-1250 :WINDOWS-1251 :WINDOWS-1252 :WINDOWS-1253 + :WINDOWS-1254 :WINDOWS-1256 :WINDOWS-1257 - ;; :CP932 :WINDOWS-1255 :WINDOWS-1258 with - ;; iconv may output combined characters, when ECL would - ;; output the base and the comibining one. Hence, no simple - ;; comparison is possible. + ;; :CP932 :WINDOWS-1255 :WINDOWS-1258 with + ;; iconv may output combined characters, when ECL would + ;; output the base and the comibining one. Hence, no simple + ;; comparison is possible. - :ISO-2022-JP - ;; :ISO-2022-JP-1 - ;; iconv doesn't support ISO-2022-JP-1 (hue hue hue) - ) - unless (progn - (format t "~%;;; Testing ~A " name) - (loop for i from 1 to 10 - always (test-output name (symbol-name name)))) - collect name) - nil) + :ISO-2022-JP + ;; :ISO-2022-JP-1 + ;; iconv doesn't support ISO-2022-JP-1 (hue hue hue) + ) + unless (progn + (format t "~%;;; Testing ~A " name) + (loop for i from 1 to 10 + always (test-output name (symbol-name name)))) + collect name) + nil)) -- 2.9.0