This is equivalent to a diff from
156279118f
to ed5da5a03e
Modified Makefile
from [e6e63de436]
to [15819b35ee].
︙ | | |
28
29
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
|
28
29
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
66
67
|
-
+
+
-
-
-
-
+
+
+
+
+
+
+
-
+
+
+
-
-
-
+
+
+
+
|
http-transport.scm filedb.scm tdb.scm \
client.scm mt.scm \
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
# module source files
MSRCFILES = ftail.scm rmtmod.scm commonmod.scm
# ftail.scm rmtmod.scm commonmod.scm removed
MSRCFILES = ducttape-lib.scm pkts.scm stml2.scm cookie.scm mutils.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
EGGS=matchable readline aokpropos 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 \
GUISRCF = dashboard-context-menu.scm dashboard-tests.scm dashboard-guimonitor.scm gutils.scm dcommon.scm tree.scm vg.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)
mofiles/%.o : %.scm
mkdir -p mofiles
csc $(CSCOPTS) -J -c $< -o mofiles/$*.o
mofiles/%.o %.import.scm : %.scm
@[ -e mofiles ] || mkdir -p mofiles
csc $(CSCOPTS) -I $* -J -c $< -o mofiles/$*.o
@touch $*.import.scm # ensure it is touched after the .o is made
ADTLSCR=mt_laststep mt_runstep mt_ezstep
HELPERS=$(addprefix $(PREFIX)/bin/,$(ADTLSCR))
DEPLOYHELPERS=$(addprefix deploytarg/,$(ADTLSCR))
MTESTHASH=$(shell fossil info|grep checkout:| awk '{print $$2}')
ifeq ($(MTESTHASH),)
|
︙ | | |
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
|
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
|
+
+
-
-
+
+
|
# ARCHSTR=$(shell bash -c "echo \$$MACHTYPE")
PNGFILES = $(shell cd docs/manual;ls *png)
#all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut ndboard
all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut tcmt
megatest.o : ducttape-lib.import.o
mtest: $(OFILES) readline-fix.scm megatest.o $(MOFILES) mofiles/ftail.o mofiles/rmtmod.o mofiles/commonmod.o
csc $(CSCOPTS) $(OFILES) $(MOFILES) megatest.o -o mtest
mtest: $(OFILES) readline-fix.scm megatest.o $(MOFILES) $(MOIMPFILES) ducttape-lib.import.o
csc $(CSCOPTS) $(OFILES) $(MOFILES) $(MOIMPFILES) megatest.o -o mtest
showmtesthash:
@echo $(MTESTHASH)
dboard : $(OFILES) $(GOFILES) dashboard.scm $(MOFILES)
csc $(CSCOPTS) $(OFILES) dashboard.scm $(GOFILES) $(MOFILES) -o dboard
|
︙ | | |
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
|
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
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
202
203
204
205
206
207
208
209
|
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
|
#
# $(PREFIX)/bin/revtagfsl : utils/revtagfsl.scm
# csc utils/revtagfsl.scm -o $(PREFIX)/bin/revtagfsl
# Special dependencies for the includes
tests.o db.o launch.o runs.o dashboard-tests.o dashboard-context-menu.o dashboard-guimonitor.o dashboard-main.o monitor.o dashboard.o \
archive.o megatest.o : db_records.scm
tests.o runs.o dashboard.o dashboard-tests.o dashboard-context-menu.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
tests.o tasks.o dashboard-tasks.o : task_records.scm
runs.o : test_records.scm
megatest.o : megatest-fossil-hash.scm
rmt.scm client.scm common.scm configf.scm dashboard-guimonitor.scm dashboard-tests.scm dashboard.scm db.scm dcommon.scm ezsteps.scm fs-transport.scm http-transport.scm index-tree.scm items.scm keys.scm launch.scm megatest.scm monitor.scm mt.scm newdashboard.scm runconfig.scm runs.scm server.scm tdb.scm tests.scm tree.scm : common_records.scm
common_records.scm : altdb.scm
mofiles/stml2.o : mofiles/cookie.o
vg.o dashboard.o : vg_records.scm
dcommon.o : run_records.scm
mofiles/stml2.o : mofiles/cookie.o
# special include based modules
mofiles/pkts.o : pkts/pkts.scm
# mofiles/mtargs.o : mtargs/mtargs.scm
# mofiles/mtconfigf.o : mtconfigf/mtconfigf.scm
# 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
rmt.o : mofiles/ducttape-lib.o mofiles/pkts.o mofiles/stml2.o mofiles/mutils.o
# *-inc.scm
megatest-fossil-hash.scm : $(SRCFILES) megatest.scm *_records.scm
echo "(define megatest-fossil-hash \"$(MTESTHASH)\")" > megatest-fossil-hash.new
if ! diff -q megatest-fossil-hash.new megatest-fossil-hash.scm ; then echo copying .new to .scm;cp -f megatest-fossil-hash.new megatest-fossil-hash.scm;fi
$(OFILES) $(GOFILES) : common_records.scm
|
︙ | | |
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
|
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
|
-
+
|
mkdir -p ext-tests
cd ext-tests;fossil open --nested $(MTQA_FOSSIL)
$(MTQA_FOSSIL) :
fossil clone https://www.kiatoa.com/fossils/megatest_qa $(MTQA_FOSSIL)
clean :
rm -f $(OFILES) $(GOFILES) $(MOFILES) $(TCMTOBJS) $(PREFIX)/megatest $(PREFIX)/dashboard mtest mtutil mtut tcmt ftail.import.scm readline-fix.scm serialize-env dboard dboard.o megatest.o dashboard.o megatest-fossil-hash.* altdb.scm mofiles/*.o vg.o
rm -f $(OFILES) $(GOFILES) $(MOFILES) $(TCMTOBJS) $(PREFIX)/megatest $(PREFIX)/dashboard mtest mtutil mtut tcmt readline-fix.scm serialize-env dboard dboard.o megatest.o dashboard.o megatest-fossil-hash.* altdb.scm mofiles/*.o vg.o commonmod.o cookie.o dashboard-main.o ducttape-lib.o ftail.o mutils.o pkts.o rmtmod.o stml2.o tcmt.o
rm -rf share
#======================================================================
# Make the records files
#======================================================================
# vg_records.scm : records.sh
|
︙ | | |
Modified common.scm
from [4d4a2441c8]
to [1751eb5552].
︙ | | |
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
-
+
+
|
(use srfi-1 data-structures posix regex-case (prefix base64 base64:)
format dot-locking csv-xml z3 udp ;; sql-de-lite
hostinfo md5 message-digest typed-records directory-utils stack
matchable regex posix (srfi 18) extras ;; tcp
(prefix nanomsg nmsg:)
(prefix sqlite3 sqlite3:)
pkts (prefix dbi dbi:)
(prefix dbi dbi:)
)
(declare (unit common))
(declare (uses commonmod))
(import commonmod)
(import pkts)
(include "common_records.scm")
;; (require-library margs)
;; (include "margs.scm")
|
︙ | | |
Added cookie.scm version [93f6026f72].
|
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
|
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
|
;;======================================================================
;; Copyright 2019, 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 <http://www.gnu.org/licenses/>.
;;======================================================================
(declare (unit cookie))
(include "stml2/cookie.scm")
|
| | | | | | | | | | | | | | | | | | | | | |
Modified dashboard.scm
from [f69a7b566e]
to [0930c846ee].
︙ | | |
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
|
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
|
-
+
|
(use format)
(require-library iup)
(import (prefix iup iup:))
(use canvas-draw)
(import canvas-draw-iup)
(use ducttape-lib)
(import ducttape-lib)
(use sqlite3 srfi-1 posix regex regex-case srfi-69 typed-records sparse-vectors) ;; defstruct
(import (prefix sqlite3 sqlite3:))
(declare (uses common))
(declare (uses margs))
(declare (uses keys))
(declare (uses items))
|
︙ | | |
2682
2683
2684
2685
2686
2687
2688
2689
2690
2691
2692
2693
2694
2695
2696
|
2682
2683
2684
2685
2686
2687
2688
2689
2690
2691
2692
2693
2694
2695
2696
|
-
+
|
(define (new-runs-updater commondat rdat)
(let* ((runnum (dboard:rdat-runnum rdat))
(start-time (current-milliseconds))
(tot-runs #f))
(if (eq? runnum 0)(dashboard:update-runs-data rdat))
(set! tot-runs (vector-length (dboard:rdat-runsbynum rdat)))
(let loop ((rn runnum))
(if (and (< (- (current-milliseconds) start-time) 500)
(if (and (< (- (current-milliseconds) start-time) 250)
(< rn tot-runs))
(let* ((newrn (if (>= runnum (vector-length (dboard:rdat-runsbynum rdat)))
0 ;; start over
(+ rn 1)))) ;; (+ runnum 1)))
(dashboard:update-run-data rn rdat)
(dboard:rdat-runnum-set! rdat newrn)
(if (> newrn 0)
|
︙ | | |
Modified diff-report.scm
from [722e4fdcd5]
to [1eae9c3686].
︙ | | |
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
|
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
|
-
+
|
(declare (unit diff-report))
(declare (uses common))
(declare (uses rmt))
(include "common_records.scm")
(use matchable)
(use fmt)
(use ducttape-lib)
(import ducttape-lib)
(define css "")
(define (diff:tests-mindat->hash tests-mindat)
(let* ((res (make-hash-table)))
(for-each
(lambda (item)
(let* ((test-name+item-path (cons (list-ref item 0) (list-ref item 1)))
|
︙ | | |
Added ducttape-lib.scm version [ee2ef474af].
|
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
|
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
|
;;======================================================================
;; Copyright 2019, 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 <http://www.gnu.org/licenses/>.
;;======================================================================
(declare (unit ducttape-lib))
(include "ducttape/ducttape-lib.scm")
|
| | | | | | | | | | | | | | | | | | | | | |
Added ducttape/Makefile version [9efb623beb].
|
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
|
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
|
help:
@echo ""
@echo "make targets:"
@echo "============="
@echo "install - build and install general_lib egg as icfadm"
@echo "test - run unit tests on ducttape-lib.scm (tests code, not egg)"
@echo "eggs-info - show chicken-install commands to get eggs upon which ducttape-lib depends"
@echo "test_example - compile an example scm against installed general_lib egg"
@echo "clean - remove binaries and other build artifacts"
@echo ""
clean:
rm -f *.so *.import.scm test_ducttape test_example foo *.c *.o
install:
chicken-install
test:
echo '(handle-exceptions exn (begin (print-call-chain) (exit 1)) (load "ducttape-lib.scm") (inote "hello")) (exit 0)' | csi
chicken-install -no-install
csc test_ducttape.scm
./test_ducttape
rm -f foo
test_example:
@csc test_example.scm
@./test_example
@rm test_example
eggs-info:
@echo chicken-install ansi-escape-sequences
@echo chicken-install slice
@echo chicken-install rfc3339
|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
Added ducttape/README version [bc9be285fc].
|
1
2
3
4
5
6
7
8
|
+
+
+
+
+
+
+
+
|
This directory holds the "ducttape" chicken scheme egg used by megatest.
Run "make test" to ensure this egg works on your system.
Run "make install" as your admin user with chicken on your $PATH to install this egg.
|
| | | | | | |
Added ducttape/ducttape-lib.import.scm version [31a238cf76].
|
1
2
3
4
5
6
7
8
9
10
11
12
13
14
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
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
|
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
|
;;;; ducttape-lib.import.scm - GENERATED BY CHICKEN 4.10.0 -*- Scheme -*-
(eval '(import
scheme
chicken
extras
ports
data-structures
posix
regex
ansi-escape-sequences
test
srfi-1
irregex
slice
srfi-13
rfc3339
directory-utils
uuid-lib
filepath
srfi-19
srfi-19
test
regex))
(##sys#register-compiled-module
'ducttape-lib
(list)
'((runs-ok . ducttape-lib#runs-ok)
(ducttape-debug-level . ducttape-lib#ducttape-debug-level)
(ducttape-debug-regex-filter . ducttape-lib#ducttape-debug-regex-filter)
(ducttape-silent-mode . ducttape-lib#ducttape-silent-mode)
(ducttape-quiet-mode . ducttape-lib#ducttape-quiet-mode)
(ducttape-log-file . ducttape-lib#ducttape-log-file)
(ducttape-color-mode . ducttape-lib#ducttape-color-mode)
(iputs-preamble . ducttape-lib#iputs-preamble)
(script-name . ducttape-lib#script-name)
(idbg . ducttape-lib#idbg)
(ierr . ducttape-lib#ierr)
(iwarn . ducttape-lib#iwarn)
(inote . ducttape-lib#inote)
(iputs . ducttape-lib#iputs)
(re-match? . ducttape-lib#re-match?)
(keyword-skim . ducttape-lib#keyword-skim)
(skim-cmdline-opts-noarg-by-regex
.
ducttape-lib#skim-cmdline-opts-noarg-by-regex)
(skim-cmdline-opts-withargs-by-regex
.
ducttape-lib#skim-cmdline-opts-withargs-by-regex)
(concat-lists . ducttape-lib#concat-lists)
(ducttape-process-command-line
.
ducttape-lib#ducttape-process-command-line)
(ducttape-append-logfile . ducttape-lib#ducttape-append-logfile)
(ducttape-activate-logfile . ducttape-lib#ducttape-activate-logfile)
(isys . ducttape-lib#isys)
(do-or-die . ducttape-lib#do-or-die)
(counter-maker . ducttape-lib#counter-maker)
(dir-is-writable? . ducttape-lib#dir-is-writable?)
(mktemp . ducttape-lib#mktemp)
(get-tmpdir . ducttape-lib#get-tmpdir)
(sendmail . ducttape-lib#sendmail)
(find-exe . ducttape-lib#find-exe)
(zeropad . ducttape-lib#zeropad)
(string-leftpad . ducttape-lib#string-leftpad)
(string-rightpad . ducttape-lib#string-rightpad)
(seconds->isodate . ducttape-lib#seconds->isodate)
(seconds->wwdate . ducttape-lib#seconds->wwdate)
(seconds->wwdate-values . ducttape-lib#seconds->wwdate-values)
(isodate->seconds . ducttape-lib#isodate->seconds)
(isodate->wwdate . ducttape-lib#isodate->wwdate)
(wwdate->seconds . ducttape-lib#wwdate->seconds)
(wwdate->isodate . ducttape-lib#wwdate->isodate)
(current-wwdate . ducttape-lib#current-wwdate)
(current-isodate . ducttape-lib#current-isodate))
(list)
(list))
;; END OF FILE
|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
Added ducttape/ducttape-lib.meta version [a22283c9d8].
|
1
2
3
4
5
6
7
8
9
10
11
12
13
|
+
+
+
+
+
+
+
+
+
+
+
+
+
|
;;; ducttape-lib.meta -*- Hen -*-
((egg "ducttape-lib.egg")
(synopsis "Miscellaneous tool and standard print routines.")
(category env)
(author "Brandon Barclay")
(doc-from-wiki)
(license "GPL-2")
;; srfi-69, posix, srfi-18
(depends regex)
(test-depends test)
; suspicious - (files "ducttape-lib")
)
|
| | | | | | | | | | | |
Added ducttape/ducttape-lib.scm version [59b0a2f94a].