- Timestamp:
- 04/09/2006 08:31:19 PM (18 years ago)
- Branches:
- experimental
- Children:
- 6a14368
- Parents:
- a101844
- Location:
- common
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
common/config
ra101844 r8ba8df4 69 69 RUN_ICA=0 70 70 71 #--- ICA report log directory72 ICALOGDIR=$JHALFSDIR/logs/ICA73 74 71 #--- Run farce testing 0(no)/1(yes) 75 72 RUN_FARCE=0 76 77 #--- farce report log directory78 FARCELOGDIR=$JHALFSDIR/logs/farce79 73 80 74 #==== INTERNAL VARIABLES ==== … … 84 78 JHALFSDIR=$BUILDDIR/jhalfs 85 79 LOGDIR=$JHALFSDIR/logs 80 81 #--- ICA report log directory 82 ICALOGDIR=$LOGDIR/ICA 83 84 #--- farce report log directory 85 FARCELOGDIR=$LOGDIR/farce -
common/func_ICA.sh
ra101844 r8ba8df4 33 33 wrt_prepare "$ITERATION" 34 34 wrt_logs_and_clean "$ITERATION" 35 echo -e "\t@touch \$@\n" >> $MKFILE36 35 PREV=$ITERATION 37 36 elif [ "$N" = "$ITERATIONS" ] ; then 38 37 echo "iteration-last: $PREV system_rebuild" >> $MKFILE 39 wrt_prepare "$ITERATION" 38 wrt_prepare "$ITERATION" "$PREV" 40 39 wrt_logs "$ITERATION" 41 #I need to gigure out how to handle this for ITERATIONS > 242 # @do_ica_work $1 $243 # @farce $1 $244 echo -e "\t@touch \$@\n" >> $MKFILE45 40 else 46 41 echo "$ITERATION: $PREV system_rebuild" >> $MKFILE 47 wrt_prepare "$ITERATION" 42 wrt_prepare "$ITERATION" "$PREV" 48 43 wrt_logs_and_clean "$ITERATION" 49 echo -e "\t@touch \$@\n" >> $MKFILE50 44 PREV=$ITERATION 51 45 fi … … 57 51 #----------------------------------# 58 52 local ITERATION=$1 53 local PREV=$2 59 54 60 55 if [[ "$PROGNAME" = "clfs" ]] && [[ "$METHOD" = "boot" ]] ; then 61 56 local PRUNEPATH="/jhalfs /sources /var/log/paco /opt /dev /home /mnt /proc \ 62 57 /root /sys /tmp /usr/src /lost+found /tools" 63 local ROOT_DIR=/58 local ROOT_DIR=/ 64 59 local DEST_TOPDIR=/jhalfs 60 local ICALOGDIR=/jhalfs/logs/ICA 61 local FARCELOGDIR=/jhalfs/logs/farce 65 62 else 66 63 local PRUNEPATH="$BUILDDIR/jhalfs $BUILDDIR/sources $BUILDDIR/var/log/paco \ … … 68 65 $BUILDDIR/proc $BUILDDIR/root $BUILDDIR/sys $BUILDDIR/tmp \ 69 66 $BUILDDIR/usr/src $BUILDDIR/lost+found $BUILDDIR/tools" 70 local ROOT_DIR=$BUILDDIR67 local ROOT_DIR=$BUILDDIR 71 68 local DEST_TOPDIR=$BUILDDIR/jhalfs 72 69 fi … … 80 77 EOF 81 78 ) >> $MKFILE 79 if [[ "$ITERATION" != "iteration-1" ]] ; then 80 wrt_do_ica_work "$PREV" "$ITERATION" "$DEST_ICA" 81 fi 82 82 fi 83 83 … … 90 90 EOF 91 91 ) >> $MKFILE 92 if [[ "$ITERATION" != "iteration-1" ]] ; then 93 wrt_do_farce_work "$PREV" "$ITERATION" "$DEST_FARCE" 94 fi 92 95 fi 96 } 97 98 #----------------------------------# 99 wrt_do_ica_work() { # 100 #----------------------------------# 101 echo -e "\t@extras/do_ica_work $1 $2 $ICALOGDIR $3" >> $MKFILE 102 } 103 104 #----------------------------------# 105 wrt_do_farce_work() { # 106 #----------------------------------# 107 local OUTPUT=$FARCELOGDIR/${1}_V_${2} 108 local PREDIR=$3/$1 109 local PREFILE=$3/$1.filelist 110 local ITEDIR=$3/$2 111 local ITEFILE=$3/$2.filelist 112 echo -e "\t@extras/farce --directory $OUTPUT $PREDIR $PREFILE $ITEDIR $ITEFILE" >> $MKFILE 93 113 } 94 114 … … 105 125 popd 106 126 @rm -f $system_rebuild 127 @touch \$@ 128 107 129 EOF 108 130 ) >> $MKFILE … … 120 142 cp $system_rebuild $ITERATION && \\ 121 143 popd 144 @touch \$@ 145 122 146 EOF 123 147 ) >> $MKFILE
Note:
See TracChangeset
for help on using the changeset viewer.