diff options
author | Erik Schmauss <erik.schmauss@intel.com> | 2019-12-11 15:14:13 -0800 |
---|---|---|
committer | Erik Schmauss <erik.schmauss@intel.com> | 2019-12-11 15:52:49 -0800 |
commit | 4fb441d1dde632e9aeb3bb911b344612bd4c48ef (patch) | |
tree | 1da0296fce52d1a419e72cd81202879b702d039b /tests/aslts | |
parent | c4ba8f40ad41ea5b41640d169f20fe83a2d90971 (diff) | |
download | acpica-4fb441d1dde632e9aeb3bb911b344612bd4c48ef.tar.gz |
ASLTS: abbu: fixing tests based on CreateField() changes
Diffstat (limited to 'tests/aslts')
3 files changed, 35 insertions, 28 deletions
diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/MsFail/msfail.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/MsFail/msfail.asl index d3a7af2d7..6f3323ebe 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/MsFail/msfail.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/MsFail/msfail.asl @@ -364,8 +364,8 @@ Method(mf08,, Serialized) Store(0x80, bf00) - if (LNotEqual(bf00, 0x80)) { - err(ts, z161, __LINE__, 0, 0, bf00, 0x80) + if (LNotEqual(bf00, Buffer(){0x80})) { + err(ts, z161, __LINE__, 0, 0, bf00, Buffer(){0x80}) } } /* if(chk0) */ @@ -622,8 +622,8 @@ Method(mf0d,, Serialized) if (LNotEqual(Local0, 0x1234569e)) { err(ts, z161, __LINE__, 0, 0, Local0, 0x1234569e) } - if (LNotEqual(bf00, 0x12345678)) { - err(ts, z161, __LINE__, 0, 0, bf00, 0x12345678) + if (LNotEqual(bf00, Buffer(){0x78, 0x56, 0x34, 0x12})) { + err(ts, z161, __LINE__, 0, 0, bf00, Buffer(){0x78, 0x56, 0x34, 0x12}) } } @@ -659,8 +659,8 @@ Method(mf0e,, Serialized) if (LNotEqual(Local0, 0x2468acef)) { err(ts, z161, __LINE__, 0, 0, Local0, 0x2468acef) } - if (LNotEqual(bf00, 0x12345675)) { - err(ts, z161, __LINE__, 0, 0, bf00, 0x12345675) + if (LNotEqual(bf00, Buffer(){0x75, 0x56, 0x34, 0x12})) { + err(ts, z161, __LINE__, 0, 0, bf00, Buffer(){0x75, 0x56, 0x34, 0x12}) } } @@ -712,8 +712,8 @@ Method(mf0f,, Serialized) if (LNotEqual(Local0, 0x1234569e)) { err(ts, z161, __LINE__, 0, 0, Local0, 0x1234569e) } - if (LNotEqual(bf00, 0x12345678)) { - err(ts, z161, __LINE__, 0, 0, bf00, 0x12345678) + if (LNotEqual(bf00, Buffer(){0x78, 0x56, 0x34, 0x12})) { + err(ts, z161, __LINE__, 0, 0, bf00, Buffer(){0x78, 0x56, 0x34, 0x12}) } } @@ -723,8 +723,8 @@ Method(mf0f,, Serialized) if (LNotEqual(Local0, 0x2468acef)) { err(ts, z161, __LINE__, 0, 0, Local0, 0x2468acef) } - if (LNotEqual(bf00, 0x12345675)) { - err(ts, z161, __LINE__, 0, 0, bf00, 0x12345675) + if (LNotEqual(bf00, Buffer(){0x75, 0x56, 0x34, 0x12})) { + err(ts, z161, __LINE__, 0, 0, bf00, Buffer(){0x75, 0x56, 0x34, 0x12}) } } @@ -768,11 +768,11 @@ Method(mf10,, Serialized) // Ok OUTP(b000) - if (LNotEqual(Local0, 0x12345678)) { - err(ts, z161, __LINE__, 0, 0, Local0, 0x12345678) + if (LNotEqual(Local0, Buffer(){0x78, 0x56, 0x34, 0x12})) { + err(ts, z161, __LINE__, 0, 0, Local0, Buffer(){0x78, 0x56, 0x34, 0x12}) } - if (LNotEqual(bf00, 0x12345678)) { - err(ts, z161, __LINE__, 0, 0, bf00, 0x12345678) + if (LNotEqual(bf00, Buffer(){0x78, 0x56, 0x34, 0x12})) { + err(ts, z161, __LINE__, 0, 0, bf00, Buffer(){0x78, 0x56, 0x34, 0x12}) } Return(POUT) diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in40.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in40.asl index 9574cd83b..3f26522c7 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in40.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in40.asl @@ -142,8 +142,8 @@ Method(act0, 4, Serialized) } } Case (10) { // LNotEqual - if (LNotEqual(arg1, 0xabcd0d08)) { - err(ts, z167, __LINE__, 0, 0, arg1, 0xabcd0d08) + if (LNotEqual(arg1, Buffer(){0x08, 0x0d, 0xcd, 0xab})) { + err(ts, z167, __LINE__, 0, 0, arg1, Buffer(){0x08, 0x0d, 0xcd, 0xab}) } } } // Switch (arg0) @@ -451,13 +451,13 @@ Method(mI01, 1, Serialized) } Case (16) { // Buffer Field // if (chk0) { - act0(OT00, arg0, c009, 0) + act0(OT00, arg0, c00b, 0) // } // if (chk0) { act0(LN08, arg0, 0, 0) // } // if (chk0) { - act0(AD00, arg0, 2, 0xabcd0d0a) + act0(AD00, arg0, 2, Buffer(){0x0a, 0x0d, 0xcd, 0xab}) // } } Default { // Uninitialized @@ -2955,6 +2955,12 @@ Method(in41, 7, Serialized) * Some params are intermediately stored to Named */ + /* + * bf01 is always treated like a buffer rather than an integer or buffer. + * The tests below assume that this bf01 is treated like an integer. + * Skip these tests for now... + */ + /* Name(ii06, 0) Name(ii07, 0) Name(ii08, 0) @@ -3017,6 +3023,7 @@ Method(in41, 7, Serialized) } else { OUTP("WARNING: some tests of ns_in40.asl are blocked!") } + */ /* diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/misc/ms1.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/misc/ms1.asl index 436208efb..2285a05ef 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/misc/ms1.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/misc/ms1.asl @@ -736,8 +736,8 @@ Method(ms16, 1, Serialized) if (LNotEqual(Local2, 2)) { err(ts, z179, __LINE__, 0, 0, Local2, 2) } - } elseif (LNotEqual(Local2, 0xE)) { - err(ts, z179, __LINE__, 0, 0, Local2, 0xE) + } elseif (LNotEqual(Local2, 0x3)) { + err(ts, z179, __LINE__, 0, 0, Local2, 0x3) } elseif (y118) { OUTP(Local1) if (LNotEqual(Local1, 10)) { @@ -773,12 +773,12 @@ Method(ms16, 1, Serialized) if (LNotEqual(Local2, 3)) { err(ts, z179, __LINE__, 0, 0, Local2, 3) } - } elseif (LNotEqual(Local2, 1)) { - err(ts, z179, __LINE__, 0, 0, Local2, 1) + } elseif (LNotEqual(Local2, 0x3)) { + err(ts, z179, __LINE__, 0, 0, Local2, 0x3) } else { OUTP(Local1) - if (LNotEqual(Local1, 10)) { - err(ts, z179, __LINE__, 0, 0, Local1, 10) + if (LNotEqual(Local1, Buffer(){0xA})) { + err(ts, z179, __LINE__, 0, 0, Local1, Buffer(){0xA}) } else { OUTP("Ok") } @@ -811,12 +811,12 @@ Method(ms16, 1, Serialized) if (LNotEqual(Local2, 3)) { err(ts, z179, __LINE__, 0, 0, Local2, 3) } - } elseif (LNotEqual(Local2, 1)) { - err(ts, z179, __LINE__, 0, 0, Local2, 1) + } elseif (LNotEqual(Local2, 0x3)) { + err(ts, z179, __LINE__, 0, 0, Local2, 0x3) } else { OUTP(Local1) - if (LNotEqual(Local1, 10)) { - err(ts, z179, __LINE__, 0, 0, Local1, 10) + if (LNotEqual(Local1, Buffer(){0xA})) { + err(ts, z179, __LINE__, 0, 0, Local1, Buffer(){0xA}) } else { OUTP("Ok") } |