Overview
Comment: | Turned off zmq for now |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | v1.54 |
Files: | files | file ages | folders |
SHA1: |
d889f19fb9e690ad63d175eefb5ffc26 |
User & Date: | mrwellan on 2013-04-25 17:10:31 |
Other Links: | branch diff | manifest | tags |
Context
2013-04-25
| ||
17:14 | Turned off zmq for now (missed one use statement) check-in: 5dfcd8ae0b user: mrwellan tags: v1.54 | |
17:10 | Turned off zmq for now check-in: d889f19fb9 user: mrwellan tags: v1.54 | |
17:09 | Tweaked parallel test to start simultaneously (much tougher test) check-in: 1f11c9d405 user: mrwellan tags: v1.54 | |
Changes
Modified Makefile from [22f5ddf088] to [529be8ed51].
1 2 3 4 5 6 7 8 | PREFIX=$(PWD) CSCOPTS= INSTALL=install SRCFILES = common.scm items.scm launch.scm \ ods.scm runconfig.scm server.scm configf.scm \ db.scm keys.scm margs.scm megatest-version.scm \ process.scm runs.scm tasks.scm tests.scm genexample.scm \ | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 | PREFIX=$(PWD) CSCOPTS= INSTALL=install SRCFILES = common.scm items.scm launch.scm \ ods.scm runconfig.scm server.scm configf.scm \ db.scm keys.scm margs.scm megatest-version.scm \ process.scm runs.scm tasks.scm tests.scm genexample.scm \ fs-transport.scm http-transport.scm \ client.scm gutils.scm synchash.scm daemon.scm GUISRCF = dashboard-tests.scm dashboard-guimonitor.scm OFILES = $(SRCFILES:%.scm=%.o) GOFILES = $(GUISRCF:%.scm=%.o) |
︙ | ︙ | |||
107 108 109 110 111 112 113 | $(INSTALL) dboard $(PREFIX)/bin/dboard utils/mk_wrapper $(PREFIX) dboard > $(PREFIX)/bin/dashboard chmod a+x $(PREFIX)/bin/dashboard install : bin $(PREFIX)/bin/mtest $(PREFIX)/bin/megatest $(PREFIX)/bin/dboard $(PREFIX)/bin/dashboard $(HELPERS) $(PREFIX)/bin/nbfake $(PREFIX)/bin/nbfind $(PREFIX)/bin/newdboard deploytarg/apropos.so : Makefile | | | 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 | $(INSTALL) dboard $(PREFIX)/bin/dboard utils/mk_wrapper $(PREFIX) dboard > $(PREFIX)/bin/dashboard chmod a+x $(PREFIX)/bin/dashboard install : bin $(PREFIX)/bin/mtest $(PREFIX)/bin/megatest $(PREFIX)/bin/dboard $(PREFIX)/bin/dashboard $(HELPERS) $(PREFIX)/bin/nbfake $(PREFIX)/bin/nbfind $(PREFIX)/bin/newdboard deploytarg/apropos.so : Makefile for i in apropos base64 canvas-draw csv-xml directory-utils dot-locking extras fmt format hostinfo http-client intarweb json md5 message-digest posix posix-extras readline regex regex-case s11n spiffy spiffy-request-vars sqlite3 srfi-1 srfi-18 srfi-69 tcp test uri-common check-errors synch matchable sql-null tcp-server rpc blob-utils string-utils variable-item defstruct uri-generic sendfile opensll openssl lookup-table list-utils stack; do \ chicken-install -prefix deploytarg -deploy $$i;done deploytarg/libsqlite3.so : CSC_OPTIONS="-Ideploytarg -Ldeploytarg" $CHICKEN_INSTALL -prefix deploytarg -deploy sqlite3 |
︙ | ︙ |
Modified db.scm from [7f603ef6c5] to [f8730e944b].
︙ | ︙ | |||
17 18 19 20 21 22 23 | ;; (import (prefix rpc rpc:)) (use sqlite3 srfi-1 posix regex regex-case srfi-69 csv-xml s11n md5 message-digest base64) (import (prefix sqlite3 sqlite3:)) (import (prefix base64 base64:)) ;; Note, try to remove this dependency | | | 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 | ;; (import (prefix rpc rpc:)) (use sqlite3 srfi-1 posix regex regex-case srfi-69 csv-xml s11n md5 message-digest base64) (import (prefix sqlite3 sqlite3:)) (import (prefix base64 base64:)) ;; Note, try to remove this dependency ;; (use zmq) (declare (unit db)) (declare (uses common)) (declare (uses keys)) (declare (uses ods)) (declare (uses fs-transport)) (declare (uses client)) |
︙ | ︙ | |||
1137 1138 1139 1140 1141 1142 1143 | ;; QUEUE UP META, TEST STATUS AND STEPS REMOTE ACCESS ;;====================================================================== ;; NOTE: Can remove the regex and base64 encoding for zmq (define (db:obj->string obj) (case *transport-type* ((fs) obj) | | | | | | 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 | ;; QUEUE UP META, TEST STATUS AND STEPS REMOTE ACCESS ;;====================================================================== ;; NOTE: Can remove the regex and base64 encoding for zmq (define (db:obj->string obj) (case *transport-type* ((fs) obj) ((http) (string-substitute (regexp "=") "_" (base64:base64-encode (with-output-to-string (lambda ()(serialize obj)))) #t)) ((zmq)(with-output-to-string (lambda ()(serialize obj)))) (else obj))) (define (db:string->obj msg) (case *transport-type* ((fs) msg) ((http) |
︙ | ︙ |
Modified megatest.scm from [c85635badd] to [c9058ed68c].
︙ | ︙ | |||
10 11 12 13 14 15 16 | ;; (include "common.scm") ;; (include "megatest-version.scm") (use sqlite3 srfi-1 posix regex regex-case srfi-69 base64 format readline apropos json) ;; (srfi 18) extras) (import (prefix sqlite3 sqlite3:)) (import (prefix base64 base64:)) | | | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 | ;; (include "common.scm") ;; (include "megatest-version.scm") (use sqlite3 srfi-1 posix regex regex-case srfi-69 base64 format readline apropos json) ;; (srfi 18) extras) (import (prefix sqlite3 sqlite3:)) (import (prefix base64 base64:)) ;; (use zmq) (declare (uses common)) (declare (uses megatest-version)) (declare (uses margs)) (declare (uses runs)) (declare (uses launch)) (declare (uses server)) |
︙ | ︙ | |||
125 126 127 128 129 130 131 | -rebuild-db : bring the database schema up to date -update-meta : update the tests metadata for all tests -env2file fname : write the environment to fname.csh and fname.sh -setvars VAR1=val1,VAR2=val2 : Add environment variables to a run NB// these are overwritten by values set in config files. -server -|hostname : start the server (reduces contention on megatest.db), use - to automatically figure out hostname | | | 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 | -rebuild-db : bring the database schema up to date -update-meta : update the tests metadata for all tests -env2file fname : write the environment to fname.csh and fname.sh -setvars VAR1=val1,VAR2=val2 : Add environment variables to a run NB// these are overwritten by values set in config files. -server -|hostname : start the server (reduces contention on megatest.db), use - to automatically figure out hostname -transport http|fs : use http or direct access for transport (default is http) -daemonize : fork into background and disconnect from stdin/out -list-servers : list the servers -stop-server id : stop server specified by id (see output of -list-servers) -repl : start a repl (useful for extending megatest) -load file.scm : load and run file.scm Spreadsheet generation |
︙ | ︙ |
Modified server.scm from [a854b85066] to [e74c0bf792].
︙ | ︙ | |||
17 18 19 20 21 22 23 | (declare (unit server)) (declare (uses common)) (declare (uses db)) (declare (uses tasks)) ;; tasks are where stuff is maintained about what is running. (declare (uses synchash)) (declare (uses http-transport)) | | | 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 | (declare (unit server)) (declare (uses common)) (declare (uses db)) (declare (uses tasks)) ;; tasks are where stuff is maintained about what is running. (declare (uses synchash)) (declare (uses http-transport)) ;; (declare (uses zmq-transport)) (declare (uses daemon)) (include "common_records.scm") (include "db_records.scm") (define (server:make-server-url hostport) (if (not hostport) |
︙ | ︙ |
Modified utils/installall.sh from [088c3ffb70] to [269ebc2426].
︙ | ︙ | |||
162 163 164 165 166 167 168 | export CSCLIBS=`echo $LD_LIBRARY_PATH | sed 's/:/ -L/g'` CSC_OPTIONS="-I$PREFIX/include -L$CSCLIBS" $CHICKEN_INSTALL $PROX -D no-library-checks -feature disable-iup-web iup # CSC_OPTIONS="-I$PREFIX/include -L$CSCLIBS" $CHICKEN_INSTALL $PROX -D no-library-checks -feature disable-iup-web -deploy -prefix $DEPLOYTARG iup # iup:1.0.2 CSC_OPTIONS="-I$PREFIX/include -L$CSCLIBS" $CHICKEN_INSTALL $PROX -D no-library-checks canvas-draw # CSC_OPTIONS="-I$PREFIX/include -L$CSCLIBS" $CHICKEN_INSTALL $PROX -D no-library-checks -deploy -prefix $DEPLOYTARG canvas-draw | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 | export CSCLIBS=`echo $LD_LIBRARY_PATH | sed 's/:/ -L/g'` CSC_OPTIONS="-I$PREFIX/include -L$CSCLIBS" $CHICKEN_INSTALL $PROX -D no-library-checks -feature disable-iup-web iup # CSC_OPTIONS="-I$PREFIX/include -L$CSCLIBS" $CHICKEN_INSTALL $PROX -D no-library-checks -feature disable-iup-web -deploy -prefix $DEPLOYTARG iup # iup:1.0.2 CSC_OPTIONS="-I$PREFIX/include -L$CSCLIBS" $CHICKEN_INSTALL $PROX -D no-library-checks canvas-draw # CSC_OPTIONS="-I$PREFIX/include -L$CSCLIBS" $CHICKEN_INSTALL $PROX -D no-library-checks -deploy -prefix $DEPLOYTARG canvas-draw # disabled zmq # #====================================================================== # disabled zmq # # Note uuid needed only for zmq 2.x series # disabled zmq # #====================================================================== # disabled zmq # # disabled zmq # # http://download.zeromq.org/zeromq-3.2.1-rc2.tar.gz # disabled zmq # # zpatchlev=-rc2 # disabled zmq # # http://download.zeromq.org/zeromq-2.2.0.tar.gz # disabled zmq # # disabled zmq # if [[ -e /usr/lib/libzmq.so ]]; then # disabled zmq # echo "Using system installed zmq library" # disabled zmq # $CHICKEN_INSTALL zmq # disabled zmq # else # disabled zmq # ZEROMQ=zeromq-2.2.0 # disabled zmq # # ZEROMQ=zeromq-3.2.2 # disabled zmq # # disabled zmq # # wget http://www.kernel.org/pub/linux/utils/util-linux/v2.22/util-linux-2.22.tar.gz # disabled zmq # UTIL_LINUX=2.21 # disabled zmq # # UTIL_LINUX=2.20.1 # disabled zmq # if ! [[ -e util-linux-${UTIL_LINUX}.tar.gz ]] ; then # disabled zmq # # wget http://www.kiatoa.com/matt/util-linux-2.20.1.tar.gz # disabled zmq # wget http://www.kernel.org/pub/linux/utils/util-linux/v${UTIL_LINUX}/util-linux-${UTIL_LINUX}.tar.gz # disabled zmq # fi # disabled zmq # # disabled zmq # if [[ -e util-linux-${UTIL_LINUX}.tar.gz ]] ; then # disabled zmq # tar xfz util-linux-${UTIL_LINUX}.tar.gz # disabled zmq # cd util-linux-${UTIL_LINUX} # disabled zmq # mkdir -p build # disabled zmq # cd build # disabled zmq # if [[ $UTIL_LINUX = "2.22" ]] ; then # disabled zmq # ../configure --prefix=$PREFIX \ # disabled zmq # --enable-shared \ # disabled zmq # --disable-use-tty-group \ # disabled zmq # --disable-makeinstall-chown \ # disabled zmq # --disable-makeinstall-setuid \ # disabled zmq # --disable-libtool-lock \ # disabled zmq # --disable-login \ # disabled zmq # --disable-sulogin \ # disabled zmq # --disable-su \ # disabled zmq # --disable-schedutils \ # disabled zmq # --disable-libmount \ # disabled zmq # --disable-mount \ # disabled zmq # --disable-losetup \ # disabled zmq # --disable-fsck \ # disabled zmq # --disable-partx \ # disabled zmq # --disable-mountpoint \ # disabled zmq # --disable-fallocate \ # disabled zmq # --disable-unshare \ # disabled zmq # --disable-eject \ # disabled zmq # --disable-agetty \ # disabled zmq # --disable-cramfs \ # disabled zmq # --disable-switch_root \ # disabled zmq # --disable-pivot_root \ # disabled zmq # --disable-kill \ # disabled zmq # --disable-libblkid \ # disabled zmq # --disable-utmpdump \ # disabled zmq # --disable-rename \ # disabled zmq # --disable-chsh-only-listed \ # disabled zmq # --disable-wall \ # disabled zmq # --disable-pg-bell \ # disabled zmq # --disable-require-password \ # disabled zmq # --disable-libtool-lock \ # disabled zmq # --disable-nls \ # disabled zmq # --disable-dmesg \ # disabled zmq # --without-ncurses # disabled zmq # else # disabled zmq # ../configure --prefix=$PREFIX \ # disabled zmq # --enable-shared \ # disabled zmq # --disable-mount \ # disabled zmq # --disable-fsck \ # disabled zmq # --disable-partx \ # disabled zmq # --disable-largefile \ # disabled zmq # --disable-tls \ # disabled zmq # --disable-libmount \ # disabled zmq # --disable-mountpoint \ # disabled zmq # --disable-nls \ # disabled zmq # --disable-rpath \ # disabled zmq # --disable-agetty \ # disabled zmq # --disable-cramfs \ # disabled zmq # --disable-switch_root \ # disabled zmq # --disable-pivot_root \ # disabled zmq # --disable-fallocate \ # disabled zmq # --disable-unshare \ # disabled zmq # --disable-rename \ # disabled zmq # --disable-schedutils \ # disabled zmq # --disable-libblkid \ # disabled zmq # --disable-wall CFLAGS='-fPIC' # disabled zmq # # disabled zmq # # --disable-makeinstall-chown \ # disabled zmq # # --disable-makeinstall-setuid \ # disabled zmq # # disabled zmq # # --disable-chsh-only-listed # disabled zmq # # --disable-pg-bell let pg not ring the bell on invalid keys # disabled zmq # # --disable-require-password # disabled zmq # # --disable-use-tty-group do not install wall and write setgid tty # disabled zmq # # --disable-makeinstall-chown # disabled zmq # # --disable-makeinstall-setuid # disabled zmq # fi # disabled zmq # # disabled zmq # (cd libuuid;make install) # disabled zmq # # make # disabled zmq # # make install # disabled zmq # cp $PREFIX/include/uuid/uuid.h $PREFIX/include/uuid.h # disabled zmq # fi # disabled zmq # # disabled zmq # # disabled zmq # cd $BUILDHOME # disabled zmq # # disabled zmq # if ! [[ -e ${ZEROMQ}${zpatchlev}.tar.gz ]] ; then # disabled zmq # wget http://download.zeromq.org/${ZEROMQ}${zpatchlev}.tar.gz # disabled zmq # fi # disabled zmq # # disabled zmq # if [[ -e ${ZEROMQ}${zpatchlev}.tar.gz ]] ; then # disabled zmq # tar xfz ${ZEROMQ}.tar.gz # disabled zmq # cd ${ZEROMQ} # disabled zmq # ln -s $PREFIX/include/uuid src # disabled zmq # # LDFLAGS=-L$PREFIX/lib ./configure --prefix=$PREFIX # disabled zmq # # disabled zmq # ./configure --enable-static --prefix=$PREFIX --with-uuid=$PREFIX LDFLAGS="-L$PREFIX/lib" CPPFLAGS="-fPIC -I$PREFIX/include" LIBS="-lgcc" # disabled zmq # # --disable-shared CPPFLAGS="-fPIC # disabled zmq # # LDFLAGS="-L/usr/lib64 -L$PREFIX/lib" ./configure --enable-static --prefix=$PREFIX # disabled zmq # make # disabled zmq # make install # disabled zmq # CSC_OPTIONS="-I$PREFIX/include -L$CSCLIBS" $CHICKEN_INSTALL $PROX zmq # disabled zmq # # CSC_OPTIONS="-I$PREFIX/include -L$CSCLIBS" $CHICKEN_INSTALL $PROX -deploy -prefix $DEPLOYTARG zmq # disabled zmq # fi # disabled zmq # fi # if zmq is in /usr/lib # disabled zmq # cd $BUILDHOME ## WEBKIT=WebKit-r131972 ## if ! [[ -e ${WEBKIT}.tar.bz2 ]] ; then ## # http://builds.nightly.webkit.org/files/trunk/src/WebKit-r131972.tar.bz2 ## wget http://builds.nightly.webkit.org/files/trunk/src/${WEBKIT}.tar.bz2 ## fi |
︙ | ︙ |