Index: Makefile ================================================================== --- Makefile +++ Makefile @@ -168,10 +168,12 @@ megatest.o : megatest-fossil-hash.scm megatest-version.scm rmt.scm client.scm common.scm configf.scm dashboard-guimonitor.scm dashboard-tests.scm dashboard.scm db.scm dcommon.scm ezsteps.scm http-transport.scm index-tree.scm items.scm keys.scm launch.scm megatest.scm monitor.scm mt.scm runconfig.scm runs.scm server.scm tdb.scm tests.scm tree.scm : common_records.scm megatest-version.scm common_records.scm : altdb.scm + +runs.o tests.o : test_records.scm # mofiles/stml2.o : mofiles/cookie.o # configf.o : mofiles/commonmod.o vg.o dashboard.o : vg_records.scm megatest-version.scm DELETED attic/test_records.scm Index: attic/test_records.scm ================================================================== --- attic/test_records.scm +++ /dev/null @@ -1,36 +0,0 @@ -;; Copyright 2006-2017, Matthew Welland. -;; -;; This file is part of Megatest. -;; -;; Megatest 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 3 of the License, or -;; (at your option) any later version. -;; -;; Megatest 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 Megatest. If not, see . - -;; make-vector-record tests testqueue testname testconfig waitons priority items -(define (make-tests:testqueue)(make-vector 7 #f)) -(define-inline (tests:testqueue-get-testname vec) (vector-ref vec 0)) -(define-inline (tests:testqueue-get-testconfig vec) (vector-ref vec 1)) -(define-inline (tests:testqueue-get-waitons vec) (vector-ref vec 2)) -(define-inline (tests:testqueue-get-priority vec) (vector-ref vec 3)) -;; items: #f=no items, list=list of items remaining, proc=need to call to get items -(define-inline (tests:testqueue-get-items vec) (vector-ref vec 4)) -(define-inline (tests:testqueue-get-itemdat vec) (vector-ref vec 5)) -(define-inline (tests:testqueue-get-item_path vec) (vector-ref vec 6)) - -(define-inline (tests:testqueue-set-testname! vec val)(vector-set! vec 0 val)) -(define-inline (tests:testqueue-set-testconfig! vec val)(vector-set! vec 1 val)) -(define-inline (tests:testqueue-set-waitons! vec val)(vector-set! vec 2 val)) -(define-inline (tests:testqueue-set-priority! vec val)(vector-set! vec 3 val)) -(define-inline (tests:testqueue-set-items! vec val)(vector-set! vec 4 val)) -(define-inline (tests:testqueue-set-itemdat! vec val)(vector-set! vec 5 val)) -(define-inline (tests:testqueue-set-item_path! vec val)(vector-set! vec 6 val)) - Index: runs.scm ================================================================== --- runs.scm +++ runs.scm @@ -34,10 +34,11 @@ (include "common_records.scm") (include "key_records.scm") (include "db_records.scm") (include "run_records.scm") +(include "test_records.scm") ;; (include "debugger.scm") ;; use this struct to facilitate refactoring ;; ADDED test_records.scm Index: test_records.scm ================================================================== --- /dev/null +++ test_records.scm @@ -0,0 +1,36 @@ +;; Copyright 2006-2017, Matthew Welland. +;; +;; This file is part of Megatest. +;; +;; Megatest 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 3 of the License, or +;; (at your option) any later version. +;; +;; Megatest 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 Megatest. If not, see . + +;; make-vector-record tests testqueue testname testconfig waitons priority items +(define (make-tests:testqueue)(make-vector 7 #f)) +(define-inline (tests:testqueue-get-testname vec) (vector-ref vec 0)) +(define-inline (tests:testqueue-get-testconfig vec) (vector-ref vec 1)) +(define-inline (tests:testqueue-get-waitons vec) (vector-ref vec 2)) +(define-inline (tests:testqueue-get-priority vec) (vector-ref vec 3)) +;; items: #f=no items, list=list of items remaining, proc=need to call to get items +(define-inline (tests:testqueue-get-items vec) (vector-ref vec 4)) +(define-inline (tests:testqueue-get-itemdat vec) (vector-ref vec 5)) +(define-inline (tests:testqueue-get-item_path vec) (vector-ref vec 6)) + +(define-inline (tests:testqueue-set-testname! vec val)(vector-set! vec 0 val)) +(define-inline (tests:testqueue-set-testconfig! vec val)(vector-set! vec 1 val)) +(define-inline (tests:testqueue-set-waitons! vec val)(vector-set! vec 2 val)) +(define-inline (tests:testqueue-set-priority! vec val)(vector-set! vec 3 val)) +(define-inline (tests:testqueue-set-items! vec val)(vector-set! vec 4 val)) +(define-inline (tests:testqueue-set-itemdat! vec val)(vector-set! vec 5 val)) +(define-inline (tests:testqueue-set-item_path! vec val)(vector-set! vec 6 val)) + Index: tests.scm ================================================================== --- tests.scm +++ tests.scm @@ -40,10 +40,11 @@ (include "common_records.scm") (include "key_records.scm") (include "db_records.scm") (include "run_records.scm") +(include "test_records.scm") (include "js-path.scm") (define (init-java-script-lib) (set! *java-script-lib* (conc (common:get-install-area) "/share/js/jquery-3.1.0.slim.min.js")) )