mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-05-04 05:50:26 +02:00
(SCM_NUM2{SIZE,PTRDIFF,SHORT,USHORT,BITS,UBITS,INT,UINT}[_DEF]): new macros. * unif.h: type renaming: scm_array -> scm_array_t scm_array_dim -> scm_array_dim_t the old names are deprecated, all in-Guile uses changed. * tags.h (scm_ubits_t): new typedef, representing unsigned scm_bits_t. * stacks.h: type renaming: scm_info_frame -> scm_info_frame_t scm_stack -> scm_stack_t the old names are deprecated, all in-Guile uses changed. * srcprop.h: type renaming: scm_srcprops -> scm_srcprops_t scm_srcprops_chunk -> scm_srcprops_chunk_t the old names are deprecated, all in-Guile uses changed. * gsubr.c, procs.c, print.c, ports.c, read.c, rdelim.c, ramap.c, rw.c, smob.c, sort.c, srcprop.c, stacks.c, strings.c, strop.c, strorder.c, strports.c, struct.c, symbols.c, unif.c, values.c, vectors.c, vports.c, weaks.c: various int/size_t -> size_t/scm_bits_t changes. * random.h: type renaming: scm_rstate -> scm_rstate_t scm_rng -> scm_rng_t scm_i_rstate -> scm_i_rstate_t the old names are deprecated, all in-Guile uses changed. * procs.h: type renaming: scm_subr_entry -> scm_subr_entry_t the old name is deprecated, all in-Guile uses changed. * options.h (scm_option_t.val): unsigned long -> scm_bits_t. type renaming: scm_option -> scm_option_t the old name is deprecated, all in-Guile uses changed. * objects.c: various long -> scm_bits_t changes. (scm_i_make_class_object): flags: unsigned long -> scm_ubits_t * numbers.h (SCM_FIXNUM_BIT): deprecated, renamed to SCM_I_FIXNUM_BIT. * num2integral.i.c: new file, multiply included by numbers.c, used to "templatize" the various integral <-> num conversion routines. * numbers.c (scm_mkbig, scm_big2num, scm_adjbig, scm_normbig, scm_copybig, scm_2ulong2big, scm_dbl2big, scm_big2dbl): deprecated. (scm_i_mkbig, scm_i_big2inum, scm_i_adjbig, scm_i_normbig, scm_i_copybig, scm_i_short2big, scm_i_ushort2big, scm_i_int2big, scm_i_uint2big, scm_i_long2big, scm_i_ulong2big, scm_i_bits2big, scm_i_ubits2big, scm_i_size2big, scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big, scm_i_dbl2big, scm_i_big2dbl, scm_short2num, scm_ushort2num, scm_int2num, scm_uint2num, scm_bits2num, scm_ubits2num, scm_size2num, scm_ptrdiff2num, scm_num2short, scm_num2ushort, scm_num2int, scm_num2uint, scm_num2bits, scm_num2ubits, scm_num2ptrdiff, scm_num2size): new functions. * modules.c (scm_module_reverse_lookup): i, n: int -> scm_bits_t.x * load.c: change int -> size_t in various places (where the variable is used to store a string length). (search-path): call scm_done_free, not scm_done_malloc. * list.c (scm_ilength): return a scm_bits_t, not long. some other {int,long} -> scm_bits_t changes. * hashtab.c: various [u]int -> scm_bits_t changes. scm_ihashx_closure -> scm_ihashx_closure_t (and made a typedef). (scm_ihashx): n: uint -> scm_bits_t use scm_bits2num instead of scm_ulong2num. * gsubr.c: various int -> scm_bits_t changes. * gh_data.c (gh_scm2double): no loss of precision any more. * gh.h (gh_str2scm): len: int -> size_t (gh_{get,set}_substr): start: int -> scm_bits_t, len: int -> size_t (gh_<num>2scm): n: int -> scm_bits_t (gh_*vector_length): return scm_[u]size_t, not unsigned long. (gh_length): return scm_bits_t, not unsigned long. * fports.h: type renaming: scm_fport -> scm_fport_t the old name is deprecated, all in-Guile uses changed. * fports.c (fport_fill_input): count: int -> scm_bits_t (fport_flush): init_size, remaining, count: int -> scm_bits_t * debug.h (scm_lookup_cstr, scm_lookup_soft, scm_evstr): removed those prototypes, as the functions they prototype don't exist. * fports.c (default_buffer_size): int -> size_t (scm_fport_buffer_add): read_size, write_size: int -> scm_bits_t default_size: int -> size_t (scm_setvbuf): csize: int -> scm_bits_t * fluids.c (n_fluids): int -> scm_bits_t (grow_fluids): old_length, i: int -> scm_bits_t (next_fluid_num, scm_fluid_ref, scm_fluid_set_x): n: int -> scm_bits_t (scm_c_with_fluids): flen, vlen: int -> scm_bits_t * filesys.c (s_scm_open_fdes): changed calls to SCM_NUM2LONG to the new and shiny SCM_NUM2INT. * extensions.c: extension -> extension_t (and made a typedef). * eval.h (SCM_IFRAME): cast to scm_bits_t, not int. just so there are no nasty surprises if/when the various deeply magic tag bits move somewhere else. * eval.c: changed the locals used to store results of SCM_IFRAME, scm_ilength and such to be of type scm_bits_t (and not int/long). (iqq): depth, edepth: int -> scm_bits_t (scm_eval_stack): int -> scm_bits_t (SCM_CEVAL): various vars are not scm_bits_t instead of int. (check_map_args, scm_map, scm_for_each): len: long -> scm_bits_t i: int -> scm_bits_t * environments.c: changed the many calls to scm_ulong2num to scm_ubits2num. (import_environment_fold): proc_as_ul: ulong -> scm_ubits_t * dynwind.c (scm_dowinds): delta: long -> scm_bits_t * debug.h: type renaming: scm_debug_info -> scm_debug_info_t scm_debug_frame -> scm_debug_frame_t the old names are deprecated, all in-Guile uses changed. (scm_debug_eframe_size): int -> scm_bits_t * debug.c (scm_init_debug): use scm_c_define instead of the deprecated scm_define. * continuations.h: type renaming: scm_contregs -> scm_contregs_t the old name is deprecated, all in-Guile uses changed. (scm_contregs_t.num_stack_items): size_t -> scm_bits_t (scm_contregs_t.num_stack_items): ulong -> scm_ubits_t * continuations.c (scm_make_continuation): change the type of stack_size form long to scm_bits_t. * ports.h: type renaming: scm_port_rw_active -> scm_port_rw_active_t (and made a typedef) scm_port -> scm_port_t scm_ptob_descriptor -> scm_ptob_descriptor_t the old names are deprecated, all in-Guile uses changed. (scm_port_t.entry): int -> scm_bits_t. (scm_port_t.line_number): int -> long. (scm_port_t.putback_buf_size): int -> size_t. * __scm.h (long_long, ulong_long): deprecated (they pollute the global namespace and have little value besides that). (SCM_BITS_LENGTH): new, is the bit size of scm_bits_t (i.e. of an SCM handle). (ifdef spaghetti): include sys/types.h and sys/stdtypes.h, if they exist (for size_t & ptrdiff_t) (scm_sizet): deprecated. * Makefile.am (noinst_HEADERS): add num2integral.i.c
224 lines
7 KiB
Scheme
Executable file
224 lines
7 KiB
Scheme
Executable file
#!../libguile/guile \
|
||
-e main -s
|
||
!#
|
||
|
||
;;;; guile-test --- run the Guile test suite
|
||
;;;; Jim Blandy <jimb@red-bean.com> --- May 1999
|
||
;;;;
|
||
;;;; Copyright (C) 1999 Free Software Foundation, Inc.
|
||
;;;;
|
||
;;;; This program is free software; you can redistribute it and/or modify
|
||
;;;; it under the terms of the GNU General Public License as published by
|
||
;;;; the Free Software Foundation; either version 2, or (at your option)
|
||
;;;; any later version.
|
||
;;;;
|
||
;;;; This program is distributed in the hope that it will be useful,
|
||
;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||
;;;; GNU General Public License for more details.
|
||
;;;;
|
||
;;;; You should have received a copy of the GNU General Public License
|
||
;;;; along with this software; see the file COPYING. If not, write to
|
||
;;;; the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
|
||
;;;; Boston, MA 02111-1307 USA
|
||
|
||
|
||
;;;; Usage: [guile -e main -s] guile-test [OPTIONS] [TEST ...]
|
||
;;;;
|
||
;;;; Run tests from the Guile test suite. Report failures and
|
||
;;;; unexpected passes to the standard output, along with a summary of
|
||
;;;; all the results. Record each reported test outcome in the log
|
||
;;;; file, `guile.log'. The exit status is #f if any of the tests
|
||
;;;; fail or pass unexpectedly.
|
||
;;;;
|
||
;;;; Normally, guile-test scans the test directory, and executes all
|
||
;;;; files whose names end in `.test'. (It assumes they contain
|
||
;;;; Scheme code.) However, you can have it execute specific tests by
|
||
;;;; listing their filenames on the command line.
|
||
;;;;
|
||
;;;; The option '--test-suite' can be given to specify the test
|
||
;;;; directory. If no such option is given, the test directory is
|
||
;;;; taken from the environment variable TEST_SUITE_DIR (if defined),
|
||
;;;; otherwise a default directory that is hardcoded in this file is
|
||
;;;; used (see "Installation" below).
|
||
;;;;
|
||
;;;; If present, the `--log-file LOG' option tells `guile-test' to put
|
||
;;;; the log output in a file named LOG.
|
||
;;;;
|
||
;;;; If present, the '--debug' option will enable a debugging mode.
|
||
;;;;
|
||
;;;;
|
||
;;;; Installation:
|
||
;;;;
|
||
;;;; If you change the #! line at the top of this script to point at
|
||
;;;; the Guile interpreter you want to test, you can call this script
|
||
;;;; as an executable instead of having to pass it as a parameter to
|
||
;;;; guile via "guile -e main -s guile-test". Further, you can edit
|
||
;;;; the definition of default-test-suite to point to the parent
|
||
;;;; directory of the `tests' tree, which makes it unnecessary to set
|
||
;;;; the environment variable `TEST_SUITE_DIR'.
|
||
;;;;
|
||
;;;;
|
||
;;;; Shortcomings:
|
||
;;;;
|
||
;;;; At the moment, due to a simple-minded implementation, test files
|
||
;;;; must live in the test directory, and you must specify their names
|
||
;;;; relative to the top of the test directory. If you want to send
|
||
;;;; me a patch that fixes this, but still leaves sane test names in
|
||
;;;; the log file, that would be great. At the moment, all the tests
|
||
;;;; I care about are in the test directory, though.
|
||
;;;;
|
||
;;;; It would be nice if you could specify the Guile interpreter you
|
||
;;;; want to test on the command line. As it stands, if you want to
|
||
;;;; change which Guile interpreter you're testing, you need to edit
|
||
;;;; the #! line at the top of this file, which is stupid.
|
||
|
||
|
||
;;; User configurable settings:
|
||
(define default-test-suite
|
||
(string-append (getenv "HOME") "/bogus-path/test-suite"))
|
||
|
||
|
||
(use-modules (test-suite lib)
|
||
(ice-9 getopt-long)
|
||
(ice-9 and-let-star))
|
||
|
||
|
||
;;; Variables that will receive their actual values later.
|
||
(define test-suite default-test-suite)
|
||
|
||
(define tmp-dir #f)
|
||
|
||
|
||
;;; General utilities, that probably should be in a library somewhere.
|
||
|
||
;;; Enable debugging
|
||
(define (enable-debug-mode)
|
||
(write-line %load-path)
|
||
(set! %load-verbosely #t)
|
||
(debug-enable 'backtrace 'debug))
|
||
|
||
;;; Traverse the directory tree at ROOT, applying F to the name of
|
||
;;; each file in the tree, including ROOT itself. For a subdirectory
|
||
;;; SUB, if (F SUB) is true, we recurse into SUB. Do not follow
|
||
;;; symlinks.
|
||
(define (for-each-file f root)
|
||
|
||
;; A "hard directory" is a path that denotes a directory and is not a
|
||
;; symlink.
|
||
(define (file-is-hard-directory? filename)
|
||
(eq? (stat:type (lstat filename)) 'directory))
|
||
|
||
(let visit ((root root))
|
||
(let ((should-recur (f root)))
|
||
(if (and should-recur (file-is-hard-directory? root))
|
||
(let ((dir (opendir root)))
|
||
(let loop ()
|
||
(let ((entry (readdir dir)))
|
||
(cond
|
||
((eof-object? entry) #f)
|
||
((or (string=? entry ".")
|
||
(string=? entry ".."))
|
||
(loop))
|
||
(else
|
||
(visit (string-append root "/" entry))
|
||
(loop))))))))))
|
||
|
||
|
||
;;; The test driver.
|
||
|
||
|
||
;;; Localizing test files and temporary data files.
|
||
|
||
(define (data-file-name filename)
|
||
(in-vicinity tmp-dir filename))
|
||
|
||
(define (test-file-name test)
|
||
(in-vicinity test-suite test))
|
||
|
||
;;; Return a list of all the test files in the test tree.
|
||
(define (enumerate-tests test-dir)
|
||
(let ((root-len (+ 1 (string-length test-dir)))
|
||
(tests '()))
|
||
(for-each-file (lambda (file)
|
||
(if (has-suffix? file ".test")
|
||
(let ((short-name
|
||
(substring file root-len)))
|
||
(set! tests (cons short-name tests))))
|
||
#t)
|
||
test-dir)
|
||
|
||
;; for-each-file presents the files in whatever order it finds
|
||
;; them in the directory. We sort them here, so they'll always
|
||
;; appear in the same order. This makes it easier to compare test
|
||
;; log files mechanically.
|
||
(sort tests string<?)))
|
||
|
||
(define (main args)
|
||
(let ((options (getopt-long args
|
||
`((test-suite
|
||
(single-char #\t)
|
||
(value #t))
|
||
(log-file
|
||
(single-char #\l)
|
||
(value #t))
|
||
(debug
|
||
(single-char #\d))))))
|
||
(define (opt tag default)
|
||
(let ((pair (assq tag options)))
|
||
(if pair (cdr pair) default)))
|
||
|
||
(if (opt 'debug #f)
|
||
(enable-debug-mode))
|
||
|
||
(set! test-suite
|
||
(or (opt 'test-suite #f)
|
||
(getenv "TEST_SUITE_DIR")
|
||
default-test-suite))
|
||
|
||
;; directory where temporary files are created.
|
||
;; when run from "make check", this must be under the build-dir,
|
||
;; not the src-dir.
|
||
(set! tmp-dir (getcwd))
|
||
|
||
(let* ((tests
|
||
(let ((foo (opt '() '())))
|
||
(if (null? foo)
|
||
(enumerate-tests test-suite)
|
||
foo)))
|
||
(log-file
|
||
(opt 'log-file "guile.log")))
|
||
|
||
;; Open the log file.
|
||
(let ((log-port (open-output-file log-file)))
|
||
|
||
;; Register some reporters.
|
||
(let ((global-pass #t)
|
||
(counter (make-count-reporter)))
|
||
(register-reporter (car counter))
|
||
(register-reporter (make-log-reporter log-port))
|
||
(register-reporter user-reporter)
|
||
(register-reporter (lambda results
|
||
(case (car results)
|
||
((fail upass unresolved error)
|
||
(set! global-pass #f)))))
|
||
|
||
;; Run the tests.
|
||
(for-each (lambda (test)
|
||
(with-test-prefix test
|
||
(load (test-file-name test))))
|
||
tests)
|
||
|
||
;; Display the final counts, both to the user and in the log
|
||
;; file.
|
||
(let ((counts ((cadr counter))))
|
||
(print-counts counts)
|
||
(print-counts counts log-port))
|
||
|
||
(close-port log-port)
|
||
(quit global-pass))))))
|
||
|
||
|
||
;;; Local Variables:
|
||
;;; mode: scheme
|
||
;;; End:
|