Megatest

Check-in [03fc95cacb]
Login
☰Home Timeline Files Branches Tags Tickets Wiki Login
Overview
Comment:Tidy up, remove some not needed references to configfmod
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | v1.65-try3
Files: files | file ages | folders
SHA1: 03fc95cacb87025a409d7dda22687770234e461f
User & Date: matt on 2019-11-16 03:25:26
Other Links: branch diff | manifest | tags
Context
2019-11-17
22:27
Added uses for import.o files in dashboard check-in: 577bbbab0b user: matt tags: v1.65-try3
2019-11-16
03:25
Tidy up, remove some not needed references to configfmod check-in: 03fc95cacb user: matt tags: v1.65-try3
03:17
Dashboard compiles check-in: dfa5ecc8d1 user: matt tags: v1.65-try3
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified Makefile from [e03fe5c6f8] to [1e47462d1c].

︙
30
31
32
33
34
35
36
37

38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58

59
60
61
62
63
64
65

30
31
32
33
34
35
36

37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57

58
59
60
61
62
63
64
65








-
+




















-
+








#   ezsteps.scm lock-queue.scm sdb.scm \
#   rmt.scm api.scm subrun.scm \
#   portlogger.scm archive.scm env.scm diff-report.scm cgisetup/models/pgdb.scm 
SRCFILES=

# removed from MSRCFILES: ftail.scm
# module source files
MSRCFILES = rmtmod.scm commonmod.scm apimod.scm archivemod.scm clientmod.scm configfmod.scm dbmod.scm dcommonmod.scm envmod.scm ezstepsmod.scm itemsmod.scm keysmod.scm launchmod.scm odsmod.scm processmod.scm runconfigmod.scm runsmod.scm servermod.scm subrunmod.scm tasksmod.scm testsmod.scm vgmod.scm megamod.scm
MSRCFILES = rmtmod.scm commonmod.scm apimod.scm archivemod.scm clientmod.scm dbmod.scm dcommonmod.scm envmod.scm ezstepsmod.scm itemsmod.scm keysmod.scm launchmod.scm odsmod.scm processmod.scm runconfigmod.scm runsmod.scm servermod.scm subrunmod.scm tasksmod.scm testsmod.scm vgmod.scm megamod.scm


# Eggs to install (straightforward ones)
EGGS=matchable readline apropos base64 regex-literals format regex-case test coops trace csv \
dot-locking posix-utils posix-extras directory-utils hostinfo tcp-server rpc csv-xml fmt \
json md5 awful http-client spiffy uri-common intarweb spiffy-request-vars \
spiffy-directory-listing ssax sxml-serializer sxml-modifications iup canvas-draw sqlite3

GUISRCF  = dashboard-context-menu.scm dashboard-tests.scm dashboard-guimonitor.scm gutils.scm dcommon.scm tree.scm vg.scm

OFILES   = $(SRCFILES:%.scm=%.o)
GOFILES  = $(GUISRCF:%.scm=%.o)

MOFILES = $(addprefix mofiles/,$(MSRCFILES:%.scm=%.o))
# compiled import files
MOIMPFILES = $(MSRCFILES:%.scm=%.import.o)

%.import.o : %.import.scm
	csc -unit $*.import -c $*.import.scm -o $*.import.o

mofiles/%.o : %.scm mofiles
mofiles/%.o : %.scm
	mkdir -p mofiles
	csc $(CSCOPTS) -J -c $< -o mofiles/$*.o

# a.import.o : a.import.scm a.o
# csc -unit a.import -c a.import.scm -o $*.o

ADTLSCR=mt_laststep mt_runstep mt_ezstep
︙
177
178
179
180
181
182
183
184

185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201

177
178
179
180
181
182
183

184
185
186
187
188
189
190
191
192
193

194
195
196
197
198
199
200








-
+









-








# Temporary while transitioning to new routine
# runs.o : run-tests-queue-classic.scm  run-tests-queue-new.scm

# for the modularized stuff

mofiles/commonmod.o : megatest-fossil-hash.scm
mofiles/dbmod.o     : mofiles/commonmod.o mofiles/keysmod.o mofiles/tasksmod.o mofiles/odsmod.o
mofiles/commonmod.o : mofiles/configfmod.o mofiles/processmod.o
mofiles/commonmod.o : mofiles/processmod.o
mofiles/rmtmod.o    : mofiles/dbmod.o mofiles/commonmod.o mofiles/apimod.o
mofiles/apimod.o    : mofiles/megamod.o mofiles/dbmod.o
# Removed from megamod.o dep:   mofiles/ftail.o
mofiles/megamod.o   : \
   mofiles/rmtmod.o \
   mofiles/commonmod.o \
   mofiles/apimod.o \
   mofiles/archivemod.o \
   mofiles/clientmod.o \
   mofiles/configfmod.o \
   mofiles/dbmod.o \
   mofiles/dcommonmod.o \
   mofiles/envmod.o \
   mofiles/ezstepsmod.o \
   mofiles/itemsmod.o \
   mofiles/keysmod.o \
   mofiles/launchmod.o \
︙

Modified commonmod.scm from [e7647bdfa6] to [1222c68df8].

︙
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43

15
16
17
18
19
20
21

22
23
24
25
26
27
28
29
30
31
32
33
34

35
36
37
38
39
40
41








-













-








;; 
;;     You should have received a copy of the GNU General Public License
;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.

;;======================================================================

(declare (unit commonmod))
(declare (uses configfmod))
(declare (uses processmod))

(module commonmod
	*
	
(import scheme chicken data-structures extras)
(import (prefix sqlite3 sqlite3:) posix typed-records srfi-18
	srfi-1 files format srfi-13 matchable 
	srfi-69 ports
	regex-case regex hostinfo srfi-4
	pkts (prefix dbi dbi:)
	stack)

(import configfmod)
(import processmod)
(import stml2)

(include "common_records.scm")
(include "megatest-fossil-hash.scm")
(include "megatest-version.scm")
︙

Modified dashboard.scm from [e8f6f8a2a7] to [bc15799dca].

︙
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46

32
33
34
35
36
37
38

39
40
41
42
43
44
45








-








(import (prefix sqlite3 sqlite3:))

;; (declare (uses common))
;; (declare (uses margs))
;; (declare (uses keys))
;; (declare (uses items))
;; (declare (uses db))
;; (declare (uses configf))
;; (declare (uses process))
;; (declare (uses launch))
;; (declare (uses runs))
;; (declare (uses dashboard-tests))
;; (declare (uses dashboard-guimonitor))
;; (declare (uses tree))
;; (declare (uses dcommon))
︙
64
65
66
67
68
69
70

71

72
73
74
75
76
77
78

63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79








+

+








(include "common_records.scm")
(include "db_records.scm")
(include "run_records.scm")
(include "task_records.scm")
(include "megatest-fossil-hash.scm")
(include "vg_records.scm")

(configf:set-debug-printers debug:print debug:print-info debug:print-error *default-log-port*)
(configf:add-eval-string "(import megamod)")


(define help (conc 
	      "Megatest Dashboard, documentation at http://www.kiatoa.com/fossils/megatest
  version " megatest-version "
  license GPL, Copyright (C) Matt Welland 2012-2017

Usage: dashboard [options]
︙
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129

116
117
118
119
120
121
122

123
124
125
126
127
128
129








-








                        "-rh5.11" ;; fix to allow running on rh5.11
			)
		 args:arg-hash
		 0))

;; (set! *functions* dbmod#*functions*)
;; (set! apimod#*functions* dbmod#*functions*)
;; (set! configfmod#*functions* dbmod#*functions*)

(include "migrate-fix.scm")

;; check for MT_* environment variables and exit if found
(if (not (args:get-arg "-test"))
    (begin
      (display "Checking for MT_ vars: ")
︙

Modified dbmod.scm from [9b5cb5d6c9] to [6a64a78df0].

︙
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44

16
17
18
19
20
21
22

23
24
25
26
27
28
29
30
31
32
33
34
35

36
37
38
39
40
41
42








-













-








;;     You should have received a copy of the GNU General Public License
;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.

;;======================================================================

(declare (unit dbmod))
(declare (uses commonmod))
(declare (uses configfmod))
(declare (uses keysmod))
(declare (uses tasksmod))
(declare (uses odsmod))

(module dbmod
	*
	
(import scheme chicken data-structures extras)
(import (prefix sqlite3 sqlite3:) posix typed-records srfi-18
	srfi-69 format ports srfi-1 matchable stack regex
	srfi-13 stack)

(import commonmod)
(import configfmod)
(import keysmod)
(import files)
(import tasksmod)
(import odsmod)

;; (use (prefix ulex ulex:))
︙

Modified keysmod.scm from [2efaf01543] to [0eefafb09c].

︙
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37

16
17
18
19
20
21
22

23
24
25
26
27
28

29
30
31
32
33
34
35








-






-








;;     You should have received a copy of the GNU General Public License
;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.

;;======================================================================

(declare (unit keysmod))
(declare (uses commonmod))
(declare (uses configfmod))
(module keysmod
	*
	
(import scheme chicken data-structures extras)
(import (prefix sqlite3 sqlite3:) posix typed-records srfi-18 srfi-69 format ports srfi-1 matchable)
(import commonmod)
(import configfmod)

;; (use (prefix ulex ulex:))
(import srfi-13)

(include "common_records.scm")
︙

Modified megamod.scm from [a807f7cf9e] to [9964e63867].

︙
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38

24
25
26
27
28
29
30

31
32
33
34
35
36
37








-








;; ;;(declare (uses apimod))
;; (declare (uses ftail))
;; ;; (declare (uses rmtmod))
;; (declare (uses commonmod))
;; (declare (uses apimod))
;; (declare (uses archivemod))
;; (declare (uses clientmod))
;; (declare (uses configfmod))
;; (declare (uses dbmod))
;; (declare (uses dcommonmod))
;; (declare (uses envmod))
;; (declare (uses ezstepsmod))
;; (declare (uses itemsmod))
;; (declare (uses keysmod))
;; (declare (uses launchmod))
︙
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123

103
104
105
106
107
108
109

110
111
112
113

114
115
116
117
118
119
120








-




-








(use (prefix mtconfigf configf:))
(define read-config configf:read-config)
(define find-and-read-config configf:find-and-read-config)
(define config:eval-string-in-environment configf:eval-string-in-environment)

(import canvas-draw-iup spiffy)


;; (import apimod)
;; (import archivemod)
;; (import clientmod)
;; (import commonmod)
;; (import configfmod)
;; (import dbmod)
;; (import dcommonmod)
;; (import envmod)
;; (import ezstepsmod)
;; (import ftail)
;; (import itemsmod)
;; (import keysmod)
︙
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185

168
169
170
171
172
173
174

175
176
177
178
179
180
181








-








			(common:watchdog)))
		    "Watchdog thread"))

(include "api-inc.scm")
(include "archive-inc.scm")
(include "client-inc.scm")
(include "common-inc.scm")
;; (include "configf-inc.scm")
(include "db-inc.scm")
(include "dcommon-inc.scm")
(include "dashboard-tests-inc.scm")
(include "env-inc.scm")
(include "ezsteps-inc.scm")
(include "gutils-inc.scm")
(include "http-transport-inc.scm")
︙

Modified megatest.scm from [9eb593a3a0] to [0293a8aa08].

︙
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65

50
51
52
53
54
55
56


57
58
59
60
61
62
63








-
-









(declare (uses commonmod))
(import commonmod)
(declare (uses rmtmod))
(import rmtmod)
(declare (uses dbmod))
(import dbmod)
;; (declare (uses configfmod))
;; (import configfmod)
(declare (uses megamod))
(import megamod)

;; invoke the imports
(declare (uses megamod.import))

(configf:set-debug-printers debug:print debug:print-info debug:print-error *default-log-port*)
︙

Modified mtut.scm from [6dd8b4fb0e] to [554246843f].

︙
21
22
23
24
25
26
27
28

29
30
31
32
33

34
35
36
37

38
39
40
41
42
43
44

21
22
23
24
25
26
27

28
29
30
31
32

33
34
35
36

37
38
39
40
41
42
43
44








-
+




-
+



-
+









;; fake out readline usage of toplevel-command
(define (toplevel-command . a) #f)

(use srfi-1 posix srfi-69 readline ;;  regex regex-case srfi-69 apropos json http-client directory-utils rpc typed-records;; (srfi 18) extras)
   srfi-19  srfi-18 extras format pkts regex regex-case
     (prefix dbi dbi:)
     nanomsg)
     nanomsg (prefix mtconfigf configf:))

;; (declare (uses common))
;; (declare (uses megatest-version))
;; (declare (uses margs))
(declare (uses configfmod))
;; (declare (uses configfmod))
(declare (uses commonmod))
(declare (uses megamod))
(import commonmod)
(import configfmod)
;; (import configfmod)
(import megamod)

;; (declare (uses rmt))

(use ducttape-lib)

(include "megatest-fossil-hash.scm")
︙

This page was generated in about 0.116s by Fossil 2.24 [452f8e1ffc] 2024-03-26 15:36:00