Megatest

Check-in [3bd051cf6a]
Login
☰Home Timeline Files Branches Tags Tickets Wiki Login
Overview
Comment:Trying to include stml2 in all needed areas - didn't seem to work
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | v1.65-real-new-runs-view-wip4
Files: files | file ages | folders
SHA1: 3bd051cf6a11faaa58f13640900f0ab01d5d3f8e
User & Date: mrwellan on 2021-03-02 20:11:01
Other Links: branch diff | manifest | tags
Context
2021-03-02
20:11
Trying to include stml2 in all needed areas - didn't seem to work Leaf check-in: 3bd051cf6a user: mrwellan tags: v1.65-real-new-runs-view-wip4 (unpublished)
2021-02-28
07:41
Used codesplitter to confirm no important differences with v1.65-real-new-runs-view, d85f01faff9033 check-in: a0ffba076b user: matt tags: v1.65-real-new-runs-view-wip3, good-one
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Modified Makefile from [26dfe3b087] to [2e7e209eb0].

︙︙
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43

           subrun.scm archive.scm env.scm		\
           diff-report.scm

# module source files
MSRCFILES = dbmod.scm servermod.scm apimod.scm commonmod.scm rmtmod.scm \
            ods.scm configfmod.scm transport.scm portlogger.scm tasks.scm \
            pgdb.scm margsmod.scm debugprint.scm client.scm items.scm \
            tdb.scm

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

# ftail.scm rmtmod.scm commonmod.scm removed
# MSRCFILES = ducttape-lib.scm pkts.scm stml2.scm cookie.scm mutils.scm	\
#             mtargs.scm commonmod.scm dbmod.scm adjutant.scm ulex.scm	\








|








29
30
31
32
33
34
35
36
37
38
39
40
41
42
43

           subrun.scm archive.scm env.scm		\
           diff-report.scm

# module source files
MSRCFILES = dbmod.scm servermod.scm apimod.scm commonmod.scm rmtmod.scm \
            ods.scm configfmod.scm transport.scm portlogger.scm tasks.scm \
            pgdb.scm margsmod.scm debugprint.scm client.scm items.scm \
            tdb.scm 

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

# ftail.scm rmtmod.scm commonmod.scm removed
# MSRCFILES = ducttape-lib.scm pkts.scm stml2.scm cookie.scm mutils.scm	\
#             mtargs.scm commonmod.scm dbmod.scm adjutant.scm ulex.scm	\
︙︙
59
60
61
62
63
64
65



66
67
68
69
70
71
72


# I'm not sure the cp is a good idea, changed a lot of things and it may not have been necessary...
# mofiles/%.o  %.import.scm : %.scm megatest-fossil-hash.scm
#	@[ -e mofiles ] || mkdir -p mofiles
#	csc $(CSCOPTS) -I mofiles -I $* -J -c $< -o $*.o
#	cp $*.o mofiles/$*.o





# ensure import.scm is touched after the .o is made
#
mofiles/%.o %.import.scm : %.scm
	csc $(CSCOPTS) -I mofiles -I $* -J -c $< -o mofiles/$*.o
	@touch $*.import.scm









>
>
>








59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75


# I'm not sure the cp is a good idea, changed a lot of things and it may not have been necessary...
# mofiles/%.o  %.import.scm : %.scm megatest-fossil-hash.scm
#	@[ -e mofiles ] || mkdir -p mofiles
#	csc $(CSCOPTS) -I mofiles -I $* -J -c $< -o $*.o
#	cp $*.o mofiles/$*.o

# mofiles/commonmod.o commonmod.import.scm : commonmod.scm mofiles/stml2.o
# 	csc $(CSCOPTS) -I mofiles -I $* -J -c $< -o mofiles/$*.o
# 	@touch $*.import.scm

# ensure import.scm is touched after the .o is made
#
mofiles/%.o %.import.scm : %.scm
	csc $(CSCOPTS) -I mofiles -I $* -J -c $< -o mofiles/$*.o
	@touch $*.import.scm
︙︙
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187


common_records.scm : altdb.scm

vg.o dashboard.o : vg_records.scm megatest-version.scm

dcommon.o : run_records.scm

mofiles/stml2.o  : mofiles/cookie.o

# 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
	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








|








176
177
178
179
180
181
182
183
184
185
186
187
188
189
190


common_records.scm : altdb.scm

vg.o dashboard.o : vg_records.scm megatest-version.scm

dcommon.o : run_records.scm

# mofiles/stml2.o  : mofiles/cookie.o

# 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
	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
︙︙

Modified commonmod.scm from [3c7c56e5e8] to [cb520c736a].

︙︙
18
19
20
21
22
23
24




25
26
27
28
29
30
31
32
33

34
35
36
37
38
39
40


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

(declare (unit commonmod))
(declare (uses margsmod))
(declare (uses debugprint))
(declare (uses configfmod))





(module commonmod
	*
	
;;(import scheme chicken data-structures extras files ports)
(import scheme chicken)
(import margsmod)
(import debugprint)
(import configfmod)


(use data-structures extras files ports)
(use 
  (prefix base64 base64:)
  (prefix sqlite3 sqlite3:) 
  (srfi 18)
  (prefix dbi dbi:)








>
>
>
>









>








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


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

(declare (unit commonmod))
(declare (uses margsmod))
(declare (uses debugprint))
(declare (uses configfmod))
;; (declare (uses stml2))

;; (include "stml2/cookie.scm")
;; (include "stml2/stml2.scm")

(module commonmod
	*
	
;;(import scheme chicken data-structures extras files ports)
(import scheme chicken)
(import margsmod)
(import debugprint)
(import configfmod)
(import stml2)

(use data-structures extras files ports)
(use 
  (prefix base64 base64:)
  (prefix sqlite3 sqlite3:) 
  (srfi 18)
  (prefix dbi dbi:)
︙︙
50
51
52
53
54
55
56
57
58
59
60
61


62
63
64
65
66
67
68

  regex-case
  sparse-vectors
  srfi-1
  srfi-4
  srfi-13
  srfi-69
  stack
  stml2
  typed-records 
  z3
 )
	


(include "common_records.scm")

;;======================================================================
;; (require-library margs)
;; (include "margs.scm")

;; (define old-exit exit)








<



|
>
>








55
56
57
58
59
60
61

62
63
64
65
66
67
68
69
70
71
72
73
74

  regex-case
  sparse-vectors
  srfi-1
  srfi-4
  srfi-13
  srfi-69
  stack

  typed-records 
  z3
 )

;; (require-library stml)

(include "common_records.scm")

;;======================================================================
;; (require-library margs)
;; (include "margs.scm")

;; (define old-exit exit)
︙︙

Modified dashboard.scm from [06687a25d1] to [44b097b0f3].

︙︙
74
75
76
77
78
79
80









81
82
83
84
85
86
87

;; 
(declare (uses dbmod))
(import dbmod)
;; (declare (uses dbmod.import))

(declare (uses servermod))
(import servermod)










(declare (uses common))
(declare (uses db))
(declare (uses configf))
(declare (uses process))
(declare (uses launch))
(declare (uses runs))








>
>
>
>
>
>
>
>
>








74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96

;; 
(declare (uses dbmod))
(import dbmod)
;; (declare (uses dbmod.import))

(declare (uses servermod))
(import servermod)

;; (declare (uses stml2))
;; (import stml2)
;; (declare (uses stml2.import))

;; (require-library stml)

(include "stml2/stml2.scm")
(import stml2)

(declare (uses common))
(declare (uses db))
(declare (uses configf))
(declare (uses process))
(declare (uses launch))
(declare (uses runs))
︙︙

Modified dbmod.scm from [c342b3fb62] to [d23766252c].

︙︙
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858

                    (lambda (bad-dbdat)
                      (debug:print-error
                       0 *default-log-port* "db:sync-tables called with todb not a read-only database " bad-dbdat))
                    readonly-slave-dbs)
                   readonly-slave-dbs))) -6)
    (else
     (let ((stmts       (make-hash-table)) ;; table-field => stmt
	   (all-stmts   '())              ;; ( ( stmt1 value1 ) ( stml2 value2 ))
	   (numrecs     (make-hash-table))
	   (start-time  (current-milliseconds))
	   (tot-count   0))
       (for-each ;; table
	(lambda (tabledat)
	  (let* ((tablename        (car tabledat))
		 (fields           (cdr tabledat))








|








844
845
846
847
848
849
850
851
852
853
854
855
856
857
858

                    (lambda (bad-dbdat)
                      (debug:print-error
                       0 *default-log-port* "db:sync-tables called with todb not a read-only database " bad-dbdat))
                    readonly-slave-dbs)
                   readonly-slave-dbs))) -6)
    (else
     (let ((stmts       (make-hash-table)) ;; table-field => stmt
	   (all-stmts   '())              ;; ( ( stmt1 value1 ) ( stmt2 value2 ))
	   (numrecs     (make-hash-table))
	   (start-time  (current-milliseconds))
	   (tot-count   0))
       (for-each ;; table
	(lambda (tabledat)
	  (let* ((tablename        (car tabledat))
		 (fields           (cdr tabledat))
︙︙

Modified diff-report.scm from [6aa4b344c0] to [f6c2dde6e3].

︙︙
18
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))
         
(declare (uses commonmod))
(declare (uses debugprint))





(import commonmod)
(import debugprint)


(include "common_records.scm")
(use matchable)
(use fmt)
(use ducttape-lib)
(define css "")









>
>
>
>
>


>








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


(declare (unit diff-report))
(declare (uses common))
(declare (uses rmt))
         
(declare (uses commonmod))
(declare (uses debugprint))
;; (declare (uses stml2))

(include "stml2/cookie.scm")
(include "stml2/stml2.scm")
	 
(import commonmod)
(import debugprint)
(import stml2)

(include "common_records.scm")
(use matchable)
(use fmt)
(use ducttape-lib)
(define css "")
︙︙

Modified megatest.scm from [1840503be8] to [ef84a758f0].

︙︙
90
91
92
93
94
95
96








97
98
99
100
101
102
103

(import dbmod)
(declare (uses dbmod.import))

(declare (uses servermod))
(import servermod)
(declare (uses servermod.import))










;; (include "common.scm")
(include "megatest-version.scm")

(declare (uses common))
;; (declare (uses megatest-version))









>
>
>
>
>
>
>
>








90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111

(import dbmod)
(declare (uses dbmod.import))

(declare (uses servermod))
(import servermod)
(declare (uses servermod.import))

;; ;; (declare (uses stml2))
;; (include "stml2/cookie.scm")
;; (include "stml2/stml2.scm")
;; 
;; (import stml2)
;; (declare (uses stml2.import))

;; (require-library stml)

;; (include "common.scm")
(include "megatest-version.scm")

(declare (uses common))
;; (declare (uses megatest-version))
︙︙

Modified mtut.scm from [b84deb4302] to [a49cec757e].

︙︙
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

(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:)
     (prefix sqlite3 sqlite3:)
     nanomsg)

(declare (uses common))
(declare (uses margsmod))
(import margsmod)

(declare (uses configf))
;; (declare (uses rmt))

(declare (uses commonmod))
(declare (uses debugprint))




(import commonmod)
(import debugprint)

(declare (uses configfmod))
(import configfmod)


(use ducttape-lib)

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

(require-library stml)


;; stuff for the mapper and checker functions
;;
(define *target-mappers*  (make-hash-table)) 
(define *runname-mappers* (make-hash-table)) 
(define *area-checkers*   (make-hash-table)) 









|
<

|
|
|

|
>
>
>
>
|

<
|
|
>





|
>








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

(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:)
     (prefix sqlite3 sqlite3:)
     nanomsg)

(declare (uses common))
(declare (uses configf))


(declare (uses margsmod))
(declare (uses debugprint))
(declare (uses configfmod))
(declare (uses commonmod))
;; (declare (uses stml2))

(include "stml2/cookie.scm")
(include "stml2/stml2.scm")
	 
(import margsmod)
(import debugprint)

(import configfmod)
(import commonmod)
(import stml2)

(use ducttape-lib)

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

;; (require-library stml)
(import stml2)

;; stuff for the mapper and checker functions
;;
(define *target-mappers*  (make-hash-table)) 
(define *runname-mappers* (make-hash-table)) 
(define *area-checkers*   (make-hash-table))
︙︙

Modified stml2.scm from [63b057818a] to [c4b458e99d].

︙︙
15
16
17
18
19
20
21
22
23

;; 
;;     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 stml2))

(include "stml2/stml2.scm")








|


15
16
17
18
19
20
21
22
23

;; 
;;     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 stml2))
(include "stml2/cookie.scm")
(include "stml2/stml2.scm")

Modified tests.scm from [cc2812bc1b] to [b82f0cb080].

︙︙
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

(declare (uses lock-queue))
(declare (uses db))
(declare (uses tdb))
(declare (uses common))
(declare (uses items))
(declare (uses runconfig))
(declare (uses server))


(declare (uses margsmod))








(import margsmod)









(use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking tcp directory-utils)
(import (prefix sqlite3 sqlite3:))
(require-library stml)

(declare (uses commonmod))
(declare (uses debugprint))
(import commonmod)
(import debugprint)

(declare (uses dbmod))
(import dbmod)

(declare (uses configfmod))
(import configfmod)

(declare (uses servermod))
(import servermod)

(include "common_records.scm")
(include "key_records.scm")
(include "db_records.scm")
(include "run_records.scm")
(include "test_records.scm")
(include "js-path.scm")








>
>

>
>
>
>
>
>
>
>

>
>
>
>
>
>
>
>



<
<
<
<
<
<
<
<
<
<
<
<
<
<
<








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

(declare (uses lock-queue))
(declare (uses db))
(declare (uses tdb))
(declare (uses common))
(declare (uses items))
(declare (uses runconfig))
(declare (uses server))

(declare (uses debugprint))
(declare (uses margsmod))
(declare (uses configfmod))
(declare (uses commonmod))
(declare (uses dbmod))
(declare (uses servermod))
;; (declare (uses stml2))

(include "stml2/stml2.scm")

(import margsmod)
(import debugprint)
(import configfmod)
(import commonmod)
(import dbmod)
(import servermod)
(import stml2)

;; (require-library stml)

(use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking tcp directory-utils)
(import (prefix sqlite3 sqlite3:))
















(include "common_records.scm")
(include "key_records.scm")
(include "db_records.scm")
(include "run_records.scm")
(include "test_records.scm")
(include "js-path.scm")
︙︙

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