Merge ~sylvain-pineau/plainbox-provider-checkbox:fix-disk-read-perf-test-mmc into plainbox-provider-checkbox:master

Proposed by Sylvain Pineau
Status: Merged
Approved by: Sylvain Pineau
Approved revision: a4a64edbe48ef93f9ab61fc8bfc6f991063652ff
Merged at revision: a8ad183880c3a6cb0284a6474201ebc521645f5e
Proposed branch: ~sylvain-pineau/plainbox-provider-checkbox:fix-disk-read-perf-test-mmc
Merge into: plainbox-provider-checkbox:master
Diff against target: 32 lines (+9/-0)
1 file modified
bin/disk_read_performance_test (+9/-0)
Reviewer Review Type Date Requested Status
Sylvain Pineau (community) Approve
Jonathan Cave (community) Needs Fixing
Review via email: mp+373826@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jonathan Cave (jocave) wrote :

Inline

review: Needs Fixing
Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

msg added

review: Needs Resubmitting
Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

Landing with support for devmapper and mmc + error msg

review: Approve
Revision history for this message
Jonathan Cave (jocave) wrote :

Thanks for the failure message

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/bin/disk_read_performance_test b/bin/disk_read_performance_test
2index 1cdea0d..ad9681c 100755
3--- a/bin/disk_read_performance_test
4+++ b/bin/disk_read_performance_test
5@@ -13,10 +13,17 @@ for disk in $@; do
6
7 disk_type=`udevadm info --name /dev/$disk --query property | grep "ID_BUS" | awk '{gsub(/ID_BUS=/," ")}{printf $1}'`
8 dev_path=`udevadm info --name /dev/$disk --query property | grep "DEVPATH" | awk '{gsub(/DEVPATH=/," ")}{printf $1}'`
9+ if [[ $dev_path =~ dm ]]; then
10+ disk_type="devmapper"
11+ fi
12 if [[ $dev_path =~ nvme ]]; then
13 disk_type="nvme"
14 fi
15+ if [[ $dev_path =~ mmc ]]; then
16+ disk_type="mmc"
17+ fi
18 if [ -z "$disk_type" ]; then
19+ echo "ERROR: disk type not recognized"
20 exit 1
21 fi
22 echo "INFO: $disk type is $disk_type"
23@@ -35,7 +42,9 @@ for disk in $@; do
24 fi
25 fi
26 ;;
27+ "devmapper" ) MIN_BUF_READ=$DEFAULT_BUF_READ;;
28 "ide" ) MIN_BUF_READ=40;;
29+ "mmc" ) MIN_BUF_READ=50;;
30 "nvme" ) MIN_BUF_READ=1000;;
31 * ) MIN_BUF_READ=$DEFAULT_BUF_READ;;
32 esac

Subscribers

People subscribed via source and target branches