Skip to content

Commit 5a40a09

Browse files
author
gaye
committed
Revert "Bug 867320 - Calendar reference workloads"
This reverts commit 4e970f5. Conflicts: test_media/reference-workload/makeReferenceWorkload.sh
1 parent 5db8a48 commit 5a40a09

File tree

6 files changed

+1
-29
lines changed

6 files changed

+1
-29
lines changed
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

test_media/reference-workload/makeReferenceWorkload.sh

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ case $1 in
2727
CONTACT_COUNT=0
2828
SMS_COUNT=0
2929
DIALER_COUNT=0
30-
CAL_COUNT=0
3130
;;
3231

3332
light)
@@ -37,7 +36,6 @@ case $1 in
3736
CONTACT_COUNT=200
3837
SMS_COUNT=200
3938
DIALER_COUNT=50
40-
CAL_COUNT=900
4139
;;
4240

4341
medium)
@@ -47,7 +45,6 @@ case $1 in
4745
CONTACT_COUNT=500
4846
SMS_COUNT=500
4947
DIALER_COUNT=100
50-
CAL_COUNT=1300
5148
;;
5249

5350
heavy)
@@ -57,7 +54,6 @@ case $1 in
5754
CONTACT_COUNT=1000
5855
SMS_COUNT=1000
5956
DIALER_COUNT=200
60-
CAL_COUNT=2400
6157
;;
6258

6359
x-heavy)
@@ -67,7 +63,6 @@ case $1 in
6763
CONTACT_COUNT=2000
6864
SMS_COUNT=2000
6965
DIALER_COUNT=500
70-
CAL_COUNT=3200
7166
;;
7267

7368
*)
@@ -110,7 +105,7 @@ else
110105
fi
111106

112107
if [ -z "$APPS" ]; then
113-
APPS="gallery music video communications/contacts sms communications/dialer calendar"
108+
APPS="gallery music video communications/contacts sms communications/dialer"
114109
fi
115110

116111
SUMMARY="Summary:\n"
@@ -177,29 +172,6 @@ for app in $APPS; do
177172
LINE=" Sms Messages: $(printf "%4d" $SMS_COUNT)"
178173
;;
179174

180-
calendar)
181-
echo "Starting calendar"
182-
if [ -z "$IDB_PRESENT" ]; then
183-
echo "Can't push calendar to b2g18 phone..."
184-
LINE=" Calendar: skipped"
185-
else
186-
adb pull /data/local/webapps/webapps.json $SCRIPT_DIR/webapps.json || exit 1
187-
CAL_INFO=$(python $SCRIPT_DIR/readJSON.py $SCRIPT_DIR/webapps.json "calendar.*/localId")
188-
IFS='/' read -a CAL_PARTS <<< "$CAL_INFO"
189-
CAL_DOMAIN=${CAL_PARTS[0]}
190-
CAL_ID=${CAL_PARTS[1]}
191-
CAL_DIR="$CAL_ID+f+app+++$CAL_DOMAIN"
192-
rm -f $SCRIPT_DIR/webapps.json
193-
if [ -z "$CAL_ID" ]; then
194-
echo "Unable to determine calendar application ID - skipping calendar..."
195-
LINE=" Calendar: skipped"
196-
else
197-
adb push $SCRIPT_DIR/calendarDb-$CAL_COUNT.sqlite $IDB_DEFAULT_BASE/$CAL_DIR$IDB_PATH/125582036br2agd-nceal.sqlite || exit 1
198-
LINE=" Calendar: $(printf "%4d" $CAL_COUNT)"
199-
fi
200-
fi
201-
;;
202-
203175
*)
204176
echo "APPS includes unknown application name ($app) - ignoring..."
205177
LINE=" $app: unknown application name"

0 commit comments

Comments
 (0)