From 974ca8a6529d17286e6853d32f262d485ec8cf6b Mon Sep 17 00:00:00 2001 From: George Jiglau Date: Tue, 21 Nov 2017 02:12:40 +0000 Subject: [PATCH] genlink: Update genlink tests --- ld/tests/dash.data | 1 - ld/tests/dash.result | 1 - ld/tests/device.data | 2 ++ ld/tests/device.result | 6 ++++++ ld/tests/ignore.data | 1 + ld/tests/ignore.result | 6 ++++++ ld/tests/longline.data | 2 -- ld/tests/longline.result | 1 - ld/tests/multiline.data | 2 ++ ld/tests/multiline.result | 6 ++++++ ld/tests/pattern.data | 2 ++ ld/tests/pattern.result | 6 ++++++ ld/tests/single.data | 2 +- ld/tests/single.result | 7 ++++++- ld/tests/tree1.data | 4 ++-- ld/tests/tree1.result | 7 ++++++- ld/tests/tree5.data | 10 +++++----- ld/tests/tree5.result | 7 ++++++- ld/tests/twomatch.data | 4 ++-- ld/tests/twomatch.result | 7 ++++++- 20 files changed, 65 insertions(+), 19 deletions(-) delete mode 100644 ld/tests/dash.data delete mode 100644 ld/tests/dash.result create mode 100644 ld/tests/device.data create mode 100644 ld/tests/device.result create mode 100644 ld/tests/ignore.data create mode 100644 ld/tests/ignore.result delete mode 100644 ld/tests/longline.data delete mode 100644 ld/tests/longline.result create mode 100644 ld/tests/multiline.data create mode 100644 ld/tests/multiline.result create mode 100644 ld/tests/pattern.data create mode 100644 ld/tests/pattern.result diff --git a/ld/tests/dash.data b/ld/tests/dash.data deleted file mode 100644 index eb12e28e..00000000 --- a/ld/tests/dash.data +++ /dev/null @@ -1 +0,0 @@ -dash END A B C D -mcpu=cortex-m0 \ No newline at end of file diff --git a/ld/tests/dash.result b/ld/tests/dash.result deleted file mode 100644 index 8d876a24..00000000 --- a/ld/tests/dash.result +++ /dev/null @@ -1 +0,0 @@ --D_A -D_B -D_C -D_D -mcpu=cortex-m0 \ No newline at end of file diff --git a/ld/tests/device.data b/ld/tests/device.data new file mode 100644 index 00000000..82b54268 --- /dev/null +++ b/ld/tests/device.data @@ -0,0 +1,2 @@ +device family A=val B=val +family END CPU=cpu FPU=fpu diff --git a/ld/tests/device.result b/ld/tests/device.result new file mode 100644 index 00000000..08441403 --- /dev/null +++ b/ld/tests/device.result @@ -0,0 +1,6 @@ +-DFAMILY -DDEVICE +-DFAMILY -DDEVICE -D_A=val -D_B=val +family +device +cpu +fpu diff --git a/ld/tests/ignore.data b/ld/tests/ignore.data new file mode 100644 index 00000000..0ed20872 --- /dev/null +++ b/ld/tests/ignore.data @@ -0,0 +1 @@ +ignore END A B C D -E=val f=val diff --git a/ld/tests/ignore.result b/ld/tests/ignore.result new file mode 100644 index 00000000..ce5436b9 --- /dev/null +++ b/ld/tests/ignore.result @@ -0,0 +1,6 @@ +-DIGNORE +-DIGNORE +ignore + + + diff --git a/ld/tests/longline.data b/ld/tests/longline.data deleted file mode 100644 index 5f71d37a..00000000 --- a/ld/tests/longline.data +++ /dev/null @@ -1,2 +0,0 @@ -longline + A=parameter B=parameter C=parameter D=parameter E==parameter -longline END F=parameter G=parameter \ No newline at end of file diff --git a/ld/tests/longline.result b/ld/tests/longline.result deleted file mode 100644 index 78a1477a..00000000 --- a/ld/tests/longline.result +++ /dev/null @@ -1 +0,0 @@ --D_A=parameter -D_B=parameter -D_C=parameter -D_D=parameter -D_E==parameter -D_F=parameter -D_G=parameter \ No newline at end of file diff --git a/ld/tests/multiline.data b/ld/tests/multiline.data new file mode 100644 index 00000000..1b13590c --- /dev/null +++ b/ld/tests/multiline.data @@ -0,0 +1,2 @@ +multiline + A=val B=val +multiline END C=val D=val diff --git a/ld/tests/multiline.result b/ld/tests/multiline.result new file mode 100644 index 00000000..a3597076 --- /dev/null +++ b/ld/tests/multiline.result @@ -0,0 +1,6 @@ +-DMULTILINE +-DMULTILINE -D_A=val -D_B=val -D_C=val -D_D=val +multiline + + + diff --git a/ld/tests/pattern.data b/ld/tests/pattern.data new file mode 100644 index 00000000..c915ebc5 --- /dev/null +++ b/ld/tests/pattern.data @@ -0,0 +1,2 @@ +p?tte* parent A=val B=val +parent END C=val D=val diff --git a/ld/tests/pattern.result b/ld/tests/pattern.result new file mode 100644 index 00000000..d999c457 --- /dev/null +++ b/ld/tests/pattern.result @@ -0,0 +1,6 @@ +-DPARENT -DPATTERN +-DPARENT -DPATTERN -D_A=val -D_B=val -D_C=val -D_D=val +parent +pattern + + diff --git a/ld/tests/single.data b/ld/tests/single.data index 027025ae..eb4e1abb 100644 --- a/ld/tests/single.data +++ b/ld/tests/single.data @@ -1 +1 @@ -single END A B C D \ No newline at end of file +single END A=val B=val diff --git a/ld/tests/single.result b/ld/tests/single.result index 3191ddd9..b9cb5680 100644 --- a/ld/tests/single.result +++ b/ld/tests/single.result @@ -1 +1,6 @@ --D_A -D_B -D_C -D_D \ No newline at end of file +-DSINGLE +-DSINGLE -D_A=val -D_B=val +single + + + diff --git a/ld/tests/tree1.data b/ld/tests/tree1.data index 7867a613..e4f3ad7c 100644 --- a/ld/tests/tree1.data +++ b/ld/tests/tree1.data @@ -1,2 +1,2 @@ -tree1 treeparent A B C D -treeparent END E F +tree1 parent A=val B=val +parent END C=val D=val diff --git a/ld/tests/tree1.result b/ld/tests/tree1.result index b71bb04e..dab933eb 100644 --- a/ld/tests/tree1.result +++ b/ld/tests/tree1.result @@ -1 +1,6 @@ --D_A -D_B -D_C -D_D -D_E -D_F \ No newline at end of file +-DPARENT -DTREE1 +-DPARENT -DTREE1 -D_A=val -D_B=val -D_C=val -D_D=val +parent +tree1 + + diff --git a/ld/tests/tree5.data b/ld/tests/tree5.data index d51a33a0..b960395c 100644 --- a/ld/tests/tree5.data +++ b/ld/tests/tree5.data @@ -1,5 +1,5 @@ -tree5 tree4 A -tree4 tree3 B -tree3 tree2 C -tree2 tree1 D -tree1 END E F +tree5 tree4 A=val +tree4 tree3 B=val +tree3 tree2 C=val +tree2 tree1 D=val +tree1 END E=VAL F=val diff --git a/ld/tests/tree5.result b/ld/tests/tree5.result index b71bb04e..a55d694b 100644 --- a/ld/tests/tree5.result +++ b/ld/tests/tree5.result @@ -1 +1,6 @@ --D_A -D_B -D_C -D_D -D_E -D_F \ No newline at end of file +-DTREE1 -DTREE2 -DTREE3 -DTREE4 -DTREE5 +-DTREE1 -DTREE2 -DTREE3 -DTREE4 -DTREE5 -D_A=val -D_B=val -D_C=val -D_D=val -D_E=VAL -D_F=val +tree1 +tree2 + + diff --git a/ld/tests/twomatch.data b/ld/tests/twomatch.data index e55df615..ab69daad 100644 --- a/ld/tests/twomatch.data +++ b/ld/tests/twomatch.data @@ -1,4 +1,4 @@ -twomatch treeparent A B C D +twomatch treeparent A=val B=val C=val D=val # the next line will be ignored because previous matches before and no + there -twomatch treeparent P Q R S +twomatch treeparent P=val Q=val R=val S=val treeparent END E F diff --git a/ld/tests/twomatch.result b/ld/tests/twomatch.result index b71bb04e..a98a4f23 100644 --- a/ld/tests/twomatch.result +++ b/ld/tests/twomatch.result @@ -1 +1,6 @@ --D_A -D_B -D_C -D_D -D_E -D_F \ No newline at end of file +-DTREEPARENT -DTWOMATCH +-DTREEPARENT -DTWOMATCH -D_A=val -D_B=val -D_C=val -D_D=val +treeparent +twomatch + +