Index: Makefile ================================================================== --- Makefile +++ Makefile @@ -28,11 +28,10 @@ PREFIX=$(PWD) CSCOPTS= INSTALL=install SRCFILES = runconfig.scm \ server.scm keys.scm \ - runs.scm \ ezsteps.scm api.scm \ archive.scm env.scm # cgisetup/models/pgdb.scm @@ -206,30 +205,28 @@ # mofiles/dbmod.o : mofiles/configfmod.o # commonmod.o dashboard.o megatest.o tcmt.o apimod.o : megatest-fossil-hash.scm -tests.o db.o launch.o runs.o \ +tests.o db.o launch.o \ dashboard-guimonitor.o dashboard-main.o \ monitor.o dashboard.o archive.o megatest.o : db_records.scm megatest-fossil-hash.scm -tests.o runs.o dashboard.o dashboard-main.o : run_records.scm +tests.o dashboard.o dashboard-main.o : run_records.scm -db.o ezsteps.o keys.o launch.o megatest.o monitor.o runs-for-ref.o runs.o tests.o : key_records.scm +db.o ezsteps.o keys.o launch.o megatest.o monitor.o tests.o : key_records.scm db.o api.o : mofiles/dbmod.o mofiles/dbfile.o mofiles/debugprint.o mofiles/commonmod.o dbmod.import.o tests.o tasks.o dashboard-tasks.o : task_records.scm -runs.o : test_records.scm - # mofiles-made : $(MOFILES) # make $(MOIMPFILES) # touch mofiles-made megatest.o : megatest-fossil-hash.scm megatest-version.scm $(MOFILES) $(MOIMPFILES) -common.scm configf.scm dashboard-guimonitor.scm dashboard.scm dcommon.scm ezsteps.scm index-tree.scm keys.scm launch.scm megatest.scm monitor.scm mt.scm newdashboard.scm runconfig.scm runs.scm server.scm tdb.scm : common_records.scm megatest-version.scm +common.scm configf.scm dashboard-guimonitor.scm dashboard.scm dcommon.scm ezsteps.scm index-tree.scm keys.scm launch.scm megatest.scm monitor.scm mt.scm newdashboard.scm runconfig.scm server.scm tdb.scm : common_records.scm megatest-version.scm common_records.scm : altdb.scm mofiles/dbfile.o : mofiles/commonmod.o @@ -250,13 +247,10 @@ # mofiles/ulex.o : ulex/ulex.scm # mofiles/mutils.o : mutils/mutils.scm # mofiles/cookie.o : stml2/cookie.scm # mofiles/stml2.o : stml2/stml2.scm -# Temporary while transitioning to new routine -# runs.o : run-tests-queue-classic.scm run-tests-queue-new.scm - # for the modularized stuff mofiles/rmtmod.o : mofiles/commonmod.o megatest-fossil-hash.scm : $(SRCFILES) megatest.scm *_records.scm echo "(define megatest-fossil-hash \"$(MTESTHASH)\")" > megatest-fossil-hash.new Index: commonmod.scm ================================================================== --- commonmod.scm +++ commonmod.scm @@ -379,11 +379,10 @@ (include "megatest-version.scm") (include "megatest-fossil-hash.scm") (include "db_records.scm") (include "key_records.scm") (include "common_records.scm") -(include "test_records.scm") ;; http - use the old http + in /tmp db ;; tcp - use tcp transport with cachedb db ;; nfs - use direct to disk access (read-only) ;; Index: dashboard.scm ================================================================== --- dashboard.scm +++ dashboard.scm @@ -67,11 +67,10 @@ (declare (uses launchmod)) (declare (uses launchmod.import)) (declare (uses keys)) -(declare (uses runs)) (declare (uses dcommon)) (declare (uses vgmod)) (use format) Index: megatest.scm ================================================================== --- megatest.scm +++ megatest.scm @@ -76,11 +76,10 @@ (declare (uses tdb)) (declare (uses api)) (declare (uses env)) (declare (uses diff-report)) -(declare (uses runs)) (declare (uses server)) (declare (uses genexample)) (declare (uses mtbody)) (import csi) DELETED runs.scm Index: runs.scm ================================================================== --- runs.scm +++ /dev/null @@ -1,67 +0,0 @@ -;; Copyright 2006-2016, 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 . - -;; strftime('%m/%d/%Y %H:%M:%S','now','localtime') - -(declare (unit runs)) -(declare (uses debugprint)) -(declare (uses commonmod)) -(declare (uses processmod)) -(declare (uses configfmod)) -(declare (uses mtargs)) -(declare (uses rmtmod)) -(declare (uses dbfile)) -(declare (uses dbmod)) -(declare (uses megatestmod)) -(declare (uses mtmod)) -(declare (uses tasksmod)) -(declare (uses servermod)) - -;; (declare (uses common)) - -(declare (uses runconfig)) -(declare (uses server)) -(declare (uses archive)) - -(use (prefix sqlite3 sqlite3:) srfi-1 posix regex regex-case srfi-69 (srfi 18) - posix-extras directory-utils pathname-expand typed-records format sxml-serializer - sxml-modifications matchable) - - - -;; (include "common_records.scm") -;; (include "key_records.scm") -;; (include "db_records.scm") -(include "run_records.scm") -;; (include "test_records.scm") - -;; (include "debugger.scm") - -(import commonmod - processmod - configfmod - debugprint - rmtmod - dbfile - dbmod - megatestmod - (prefix mtargs args:) - mtmod - tasksmod - servermod - ) - DELETED test_records.scm Index: test_records.scm ================================================================== --- test_records.scm +++ /dev/null @@ -1,17 +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 . -