From 2884eeabfd9341c95555c3bd4670e5dbc8a8bb71 Mon Sep 17 00:00:00 2001 From: Stewart Smith Date: Fri, 10 Nov 2017 17:08:55 +1100 Subject: ffspart/pflash: fix tests for new VOLATILE flag Fixes: b786e7ba1d34c5a4d8baa6304f4d930539cefac8 Signed-off-by: Stewart Smith --- external/pflash/test/files/01-info.ffs | 9 +++++---- external/pflash/test/files/06-miscprint.ffs | 10 +++++----- external/pflash/test/results/01-info.out | 12 ++++++------ external/pflash/test/results/06-miscprint.out | 10 +++++----- external/pflash/test/tests/01-info | 2 +- external/pflash/test/tests/06-miscprint | 6 +++++- 6 files changed, 27 insertions(+), 22 deletions(-) (limited to 'external') diff --git a/external/pflash/test/files/01-info.ffs b/external/pflash/test/files/01-info.ffs index 517dc47b..0992b337 100644 --- a/external/pflash/test/files/01-info.ffs +++ b/external/pflash/test/files/01-info.ffs @@ -1,4 +1,5 @@ -ONE,0x00000300,0x00000100,EV,/dev/zero -TWO,0x00000400,0x00000100,EF,/dev/zero -THREE,0x00000500,0x00000100,EF,/dev/zero -FOUR,0x00000600,0x00000100,EF,/dev/zero +ONE,0x00003000,0x00001000,EV,/dev/zero +TWO,0x00004000,0x00001000,EF,/dev/zero +THREE,0x00005000,0x00001000,EF,/dev/zero +FOUR,0x00006000,0x00001000,EF,/dev/zero +FIVE,0x00007000,0x1000,L,/dev/zero diff --git a/external/pflash/test/files/06-miscprint.ffs b/external/pflash/test/files/06-miscprint.ffs index a0bd944f..461e4089 100644 --- a/external/pflash/test/files/06-miscprint.ffs +++ b/external/pflash/test/files/06-miscprint.ffs @@ -1,5 +1,5 @@ -PRESERVED,0x00300,0x100,P,/dev/zero -READONLY,0x000400,0x100,R,/dev/zero -REPROVISION,0x500,0x100,F,/dev/zero -BACKUP,0x00000600,0x100,B,/dev/zero -VOLATILE,0x00000700,0x100,V,/dev/zero +PRESERVED,0x003000,0x1000,P,/dev/zero +READONLY,0x0004000,0x1000,R,/dev/zero +REPROVISION,0x5000,0x1000,F,/dev/zero +BACKUP,0x000006000,0x1000,B,/dev/zero +VOLATILE,0x000007000,0x1000,L,/dev/zero diff --git a/external/pflash/test/results/01-info.out b/external/pflash/test/results/01-info.out index ba4c6fa0..628ddcc9 100644 --- a/external/pflash/test/results/01-info.out +++ b/external/pflash/test/results/01-info.out @@ -6,9 +6,9 @@ Erase granule = 0KB B:BACKUP, F:REPROVISION, V:VOLATILE TOC@0x00000000 Partitions: ----------- -ID=00 part 0x00000000..0x00000300 (actual=0x00000300) [------] -ID=01 ONE 0x00000300..0x00000400 (actual=0x00000100) [E-----] -ID=02 TWO 0x00000400..0x00000500 (actual=0x00000100) [E---F-] -ID=03 THREE 0x00000500..0x00000600 (actual=0x00000100) [E---F-] -ID=04 FOUR 0x00000600..0x00000700 (actual=0x00000100) [E---F-] -ID=05 FIVE 0x00000700..0x00000800 (actual=0x00000100) [-----V] +ID=00 part 0x00000000..0x00001000 (actual=0x00001000) [------] +ID=01 ONE 0x00003000..0x00004000 (actual=0x00001000) [E-----] +ID=02 TWO 0x00004000..0x00005000 (actual=0x00001000) [E---F-] +ID=03 THREE 0x00005000..0x00006000 (actual=0x00001000) [E---F-] +ID=04 FOUR 0x00006000..0x00007000 (actual=0x00001000) [E---F-] +ID=05 FIVE 0x00007000..0x00008000 (actual=0x00001000) [-----V] diff --git a/external/pflash/test/results/06-miscprint.out b/external/pflash/test/results/06-miscprint.out index 58aeaf95..9ee2af62 100644 --- a/external/pflash/test/results/06-miscprint.out +++ b/external/pflash/test/results/06-miscprint.out @@ -3,7 +3,7 @@ Name: PRESERVED (ID=01) Start End Actual -0x00000300 0x00000400 0x00000100 +0x00003000 0x00004000 0x00001000 Flags: PRESERVED [P] @@ -12,7 +12,7 @@ Name: READONLY (ID=02) Start End Actual -0x00000400 0x00000500 0x00000100 +0x00004000 0x00005000 0x00001000 Flags: READONLY [R] @@ -21,7 +21,7 @@ Name: REPROVISION (ID=03) Start End Actual -0x00000500 0x00000600 0x00000100 +0x00005000 0x00006000 0x00001000 Flags: REPROVISION [F] @@ -30,7 +30,7 @@ Name: BACKUP (ID=04) Start End Actual -0x00000600 0x00000700 0x00000100 +0x00006000 0x00007000 0x00001000 Flags: BACKUP [B] @@ -39,7 +39,7 @@ Name: VOLATILE (ID=05) Start End Actual -0x00000700 0x00000800 0x00000100 +0x00007000 0x00008000 0x00001000 Flags: VOLATILE [V] diff --git a/external/pflash/test/tests/01-info b/external/pflash/test/tests/01-info index 7d6fd523..3941461d 100644 --- a/external/pflash/test/tests/01-info +++ b/external/pflash/test/tests/01-info @@ -3,7 +3,7 @@ touch "$DATA_DIR/$CUR_TEST.pnor" # Don't record the output of ffspart -../ffspart/ffspart -s 0x100 -c 10 -i "$DATA_DIR/$CUR_TEST.ffs" \ +../ffspart/ffspart -s 0x1000 -c 10 -i "$DATA_DIR/$CUR_TEST.ffs" \ -p "$DATA_DIR/$CUR_TEST.pnor" 2>&1 >/dev/null if [ "$?" -ne 0 ] ; then fail_test diff --git a/external/pflash/test/tests/06-miscprint b/external/pflash/test/tests/06-miscprint index e4957a94..858ab2b5 100644 --- a/external/pflash/test/tests/06-miscprint +++ b/external/pflash/test/tests/06-miscprint @@ -3,7 +3,7 @@ touch "$DATA_DIR/$CUR_TEST.pnor" # Don't record the output of ffspart -../ffspart/ffspart -s 0x100 -c 10 -i "$DATA_DIR/$CUR_TEST.ffs" \ +../ffspart/ffspart -s 0x1000 -c 10 -i "$DATA_DIR/$CUR_TEST.ffs" \ -p "$DATA_DIR/$CUR_TEST.pnor" 2>&1 >/dev/null if [ "$?" -ne 0 ] ; then fail_test @@ -25,6 +25,10 @@ run_binary "./pflash" "--detail=4 -F $DATA_DIR/$CUR_TEST.pnor" if [ "$?" -ne 0 ] ; then fail_test; fi +run_binary "./pflash" "--detail=5 -F $DATA_DIR/$CUR_TEST.pnor" +if [ "$?" -ne 0 ] ; then + fail_test; +fi # The test infrastructure will clean up but lets no chew unnecessarily # though disk space -- cgit v1.2.1