Overview
Comment: | Got deploy 90% right (need only to get libuuid handled correctly) |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
c29338ea06067b2b04bc79b5f03eb0b8 |
User & Date: | matt on 2012-11-05 22:32:02 |
Other Links: | manifest | tags |
Context
2012-11-05
| ||
22:48 | Added deploy support to makefile check-in: 99ad4e773f user: matt tags: trunk | |
22:32 | Got deploy 90% right (need only to get libuuid handled correctly) check-in: c29338ea06 user: matt tags: trunk | |
15:48 | Removed merge droppings from installall.sh check-in: af3460b16c user: mrwellan tags: trunk | |
Changes
Modified Makefile from [97c667eb36] to [c00acd4d12].
︙ | ︙ | |||
17 18 19 20 21 22 23 24 25 26 27 28 29 30 | all : mtest dboard mtest: $(OFILES) megatest.o csc $(CSCOPTS) $(OFILES) megatest.o -o mtest dboard : $(OFILES) $(GOFILES) csc $(OFILES) $(GOFILES) -o dboard # Special dependencies for the includes tests.o db.o launch.o runs.o dashboard-tests.o dashboard-guimonitor.o dashboard-main.o monitor.o dashboard.o megatest.o : db_records.scm tests.o runs.o dashboard.o dashboard-tests.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 | > > > > > > > | 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 | all : mtest dboard mtest: $(OFILES) megatest.o csc $(CSCOPTS) $(OFILES) megatest.o -o mtest dboard : $(OFILES) $(GOFILES) csc $(OFILES) $(GOFILES) -o dboard $(DEPLOYTARG)/megatest : $(OFILES) megatest.o csc -deployed $(CSCOPTS) $(OFILES) megatest.o -o $(DEPLOYTARG)/megatest $(DEPLOYTARG)/dashboard : $(OFILES) $(GOFILES) csc -deployed $(OFILES) $(GOFILES) -o $(DEPLOYTARG)/dashboard # Special dependencies for the includes tests.o db.o launch.o runs.o dashboard-tests.o dashboard-guimonitor.o dashboard-main.o monitor.o dashboard.o megatest.o : db_records.scm tests.o runs.o dashboard.o dashboard-tests.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 |
︙ | ︙ |
Modified tests/Makefile from [2c0e45fcbc] to [6078b877de].
︙ | ︙ | |||
47 48 49 50 51 52 53 | # NOTE: Only one instance can be a server test5 : fullprep cd fullrun;sleep 0;$(MEGATEST) -runall $(TARGET) :runname $(RUNNAME)_aa -debug $(DEBUG) $(LOGGING) > aa.log 2> aa.log & cd fullrun;sleep 10;$(MEGATEST) -runall $(TARGET) :runname $(RUNNAME)_ab -debug $(DEBUG) $(LOGGING) > ab.log 2> ab.log & cd fullrun;sleep 10;$(MEGATEST) -runall $(TARGET) :runname $(RUNNAME)_ac -debug $(DEBUG) $(LOGGING) > ac.log 2> ac.log & cd fullrun;sleep 10;$(MEGATEST) -runall $(TARGET) :runname $(RUNNAME)_ad -debug $(DEBUG) $(LOGGING) > ad.log 2> ad.log & | | | | 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 | # NOTE: Only one instance can be a server test5 : fullprep cd fullrun;sleep 0;$(MEGATEST) -runall $(TARGET) :runname $(RUNNAME)_aa -debug $(DEBUG) $(LOGGING) > aa.log 2> aa.log & cd fullrun;sleep 10;$(MEGATEST) -runall $(TARGET) :runname $(RUNNAME)_ab -debug $(DEBUG) $(LOGGING) > ab.log 2> ab.log & cd fullrun;sleep 10;$(MEGATEST) -runall $(TARGET) :runname $(RUNNAME)_ac -debug $(DEBUG) $(LOGGING) > ac.log 2> ac.log & cd fullrun;sleep 10;$(MEGATEST) -runall $(TARGET) :runname $(RUNNAME)_ad -debug $(DEBUG) $(LOGGING) > ad.log 2> ad.log & cd fullrun;sleep 10;$(MEGATEST) -runall $(TARGET) :runname $(RUNNAME)_ae -debug $(DEBUG) $(LOGGING) > ae.log 2> ae.log & cd fullrun;sleep 10;$(MEGATEST) -runall $(TARGET) :runname $(RUNNAME)_af -debug $(DEBUG) $(LOGGING) > af.log 2> af.log & test6: fullprep cd fullrun;$(MEGATEST) -runtests runfirst -testpatt %/1 -reqtarg ubuntu/nfs/none :runname $(RUNNAME)_itempatt -v cd fullrun;$(MEGATEST) -runtests runfirst -testpatt %blahha% -reqtarg ubuntu/nfs/none :runname $(RUNNAME)_itempatt -debug 10 cd fullrun;$(MEGATEST) -rollup :runname newrun -target ubuntu/nfs/none -debug 10 |
︙ | ︙ |
Modified tests/fullrun/tests/sqlitespeed/runscript.rb from [a573e1a656] to [45705f52bd].
︙ | ︙ | |||
14 15 16 17 18 19 20 | # file_size_checker(stepname, filename, minsize, maxsize) - negative means ignore # file_size_checker('create db','testing.db',100,-1) num_records=rand(5) # 0000 record_step("add #{num_records}","start","n/a") status=false (0..num_records).each do |i| | > | | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | # file_size_checker(stepname, filename, minsize, maxsize) - negative means ignore # file_size_checker('create db','testing.db',100,-1) num_records=rand(5) # 0000 record_step("add #{num_records}","start","n/a") status=false (0..num_records).each do |i| randstring="abc"; # "a;lskdfja;sdfj;alsdfj;aslfdj;alsfja;lsfdj;alsfja;lsjfd;lasfjl;asdfja;slfj;alsjf;asljf;alsjf;lasdjf;lasjf;lasjf;alsjf;lashflkashflkerhflkdsvnlasldhlfaldf" # status=system "sqlite3 testing.db \"insert into blah (name) values ('#{randstring}');\"" system "megatest -step testing :state wrote_junk :status #{num_records}" sleep(5) puts "i=#{i}" end if status==0 status='pass' |
︙ | ︙ |
Modified utils/installall.sh from [7cbbf68d68] to [e461189985].
︙ | ︙ | |||
21 22 23 24 25 26 27 | echo You are using proxy="$proxy" echo echo "Set additional_libpath to help find gtk or other libraries, don't forget a leading :" echo ADDITIONAL_LIBPATH=$ADDITIONAL_LIBPATH echo echo To use previous IUP libraries set USEOLDIUP to yes echo USEOLDIUP=$USEOLDIUP | | | 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 | echo You are using proxy="$proxy" echo echo "Set additional_libpath to help find gtk or other libraries, don't forget a leading :" echo ADDITIONAL_LIBPATH=$ADDITIONAL_LIBPATH echo echo To use previous IUP libraries set USEOLDIUP to yes echo USEOLDIUP=$USEOLDIUP echo echo Hit ^C now to do that # A nice way to run this script: # # script -c 'PREFIX=/tmp/delme ./installall.sh ' installall.log # logpro installall.logpro installall.html < installall.log # firefox installall.html |
︙ | ︙ | |||
94 95 96 97 98 99 100 | for a in `ls */*.meta|cut -f1 -d/` ; do echo $a (cd $a;chicken-install) done export LIBPATH=$PREFIX/lib$ADDITIONAL_LIBPATH | | | 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 | for a in `ls */*.meta|cut -f1 -d/` ; do echo $a (cd $a;chicken-install) done export LIBPATH=$PREFIX/lib$ADDITIONAL_LIBPATH export LD_LIBRARY_PATH$=$LIBPATH export SQLITE3_VERSION=3071401 echo Install sqlite3 if ! [[ -e sqlite-autoconf-$SQLITE3_VERSION.tar.gz ]]; then wget http://www.sqlite.org/sqlite-autoconf-$SQLITE3_VERSION.tar.gz fi |
︙ | ︙ | |||
229 230 231 232 233 234 235 | --disable-switch_root \ --disable-pivot_root \ --disable-fallocate \ --disable-unshare \ --disable-rename \ --disable-schedutils \ --disable-libblkid \ | | < > | | > > | | 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 | --disable-switch_root \ --disable-pivot_root \ --disable-fallocate \ --disable-unshare \ --disable-rename \ --disable-schedutils \ --disable-libblkid \ --disable-wall CFLAGS='-fPIC' # --disable-makeinstall-chown \ # --disable-makeinstall-setuid \ # --disable-chsh-only-listed # --disable-pg-bell let pg not ring the bell on invalid keys # --disable-require-password # --disable-use-tty-group do not install wall and write setgid tty # --disable-makeinstall-chown # --disable-makeinstall-setuid fi (cd libuuid;make install) # make # make install cp $PREFIX/include/uuid/uuid.h $PREFIX/include/uuid.h fi cd $BUILDHOME # http://download.zeromq.org/zeromq-3.2.1-rc2.tar.gz # zpatchlev=-rc2 # http://download.zeromq.org/zeromq-2.2.0.tar.gz ZEROMQ=zeromq-2.2.0 # ZEROMQ=zeromq-3.2.1 if ! [[ -e ${ZEROMQ}${zpatchlev}.tar.gz ]] ; then wget http://download.zeromq.org/${ZEROMQ}${zpatchlev}.tar.gz fi if [[ -e ${ZEROMQ}${zpatchlev}.tar.gz ]] ; then tar xfz ${ZEROMQ}.tar.gz cd ${ZEROMQ} ln -s $PREFIX/include/uuid src # LDFLAGS=-L$PREFIX/lib ./configure --prefix=$PREFIX ./configure --enable-static --disable-shared --prefix=$PREFIX --with-uuid=$PREFIX LDFLAGS="-L$PREFIX/lib" CPPFLAGS="-fPIC -I$PREFIX/include" LIBS="-lgcc" # LDFLAGS="-L/usr/lib64 -L$PREFIX/lib" ./configure --enable-static --prefix=$PREFIX make make install CSC_OPTIONS="-I$PREFIX/include -L$CSCLIBS" chicken-install $PROX zmq # CSC_OPTIONS="-I$PREFIX/include -L$CSCLIBS" chicken-install $PROX -deploy -prefix $DEPLOYTARG zmq fi cd $BUILDHOME |
︙ | ︙ |