Overview
| Comment: | fixed couple merge issues |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v1.60 |
| Files: | files | file ages | folders |
| SHA1: |
cf21f4b4f1ad35ae83d638d292c0f7dc |
| User & Date: | matt on 2015-04-12 20:43:38 |
| Other Links: | branch diff | manifest | tags |
Context
|
2015-04-14
| ||
| 00:23 | Added missing stuff to Makefile.installall check-in: 724068df9f user: matt tags: v1.60 | |
|
2015-04-12
| ||
| 21:03 | Minor merge from v1.60 prior to more big changes: check-in: a72834e9cd user: matt tags: multi-area | |
| 20:43 | fixed couple merge issues check-in: cf21f4b4f1 user: matt tags: v1.60 | |
|
2015-04-11
| ||
| 14:43 | Added setup example to fullrun/megatest.config for enabling local db's check-in: 338ff9b166 user: matt tags: v1.60 | |
Changes
Modified configf.scm from [c344d55487] to [8f3e5609c0].
| ︙ | ︙ | |||
91 92 93 94 95 96 97 |
exn
(debug:print 0 "ERROR: failed to process config input \"" l "\"")
(if (or allow-system
(not (member cmdtype '("system" "shell"))))
(with-input-from-string fullcmd
(lambda ()
(set! result ((eval (read)) ht))))
| | | 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 |
exn
(debug:print 0 "ERROR: failed to process config input \"" l "\"")
(if (or allow-system
(not (member cmdtype '("system" "shell"))))
(with-input-from-string fullcmd
(lambda ()
(set! result ((eval (read)) ht))))
(set! result (conc "#{(" cmdtype ") " cmd "}"))))
(loop (conc prestr result poststr)))
res))
res)))
;; Run a shell command and return the output as a string
(define (shell cmd)
(let* ((output (cmd-run->list cmd))
|
| ︙ | ︙ |
Modified megatest.scm from [00a199ef0c] to [2b7acd1b9e].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 |
;; Copyright 2006-2012, Matthew Welland.
;;
;; This program is made available under the GNU GPL version 2.0 or
;; greater. See the accompanying file COPYING for details.
;;
;; This program is distributed WITHOUT ANY WARRANTY; without even the
;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
;; PURPOSE.
;; (include "common.scm")
;; (include "megatest-version.scm")
(define (toplevel-command . a) #f)
(use sqlite3 srfi-1 posix regex regex-case srfi-69 base64 readline apropos json http-client directory-utils rpc ;; (srfi 18) extras)
http-client srfi-18 extras format) ;; zmq extras)
;; Added for csv stuff - will be removed
;;
| > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 |
;; Copyright 2006-2012, Matthew Welland.
;;
;; This program is made available under the GNU GPL version 2.0 or
;; greater. See the accompanying file COPYING for details.
;;
;; This program is distributed WITHOUT ANY WARRANTY; without even the
;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
;; PURPOSE.
;; (include "common.scm")
;; (include "megatest-version.scm")
;; fake out readline usage of toplevel-command
(define (toplevel-command . a) #f)
(use sqlite3 srfi-1 posix regex regex-case srfi-69 base64 readline apropos json http-client directory-utils rpc ;; (srfi 18) extras)
http-client srfi-18 extras format) ;; zmq extras)
;; Added for csv stuff - will be removed
;;
|
| ︙ | ︙ |