From b7f2c45191a15d028ecd407e7d7723473d0b0a89 Mon Sep 17 00:00:00 2001 From: Al Stone Date: Jul 02 2019 20:58:14 +0000 Subject: Update CI tests, now that I can demonstrate they work correctly Signed-off-by: Al Stone --- diff --git a/tests/badcode/badcode.asl.result b/tests/badcode/badcode.asl.result index 100cb51..e4f174c 100644 --- a/tests/badcode/badcode.asl.result +++ b/tests/badcode/badcode.asl.result @@ -50,7 +50,7 @@ badcode.asl 80: CreateField (BUF1, 0, Subtract (4, 4), FLD1) Remark 2089 - Object is not referenced ^ (Name [FLD1] is within a method [MTH1]) badcode.asl 80: CreateField (BUF1, 0, Subtract (4, 4), FLD1) -Error 6083 - Operand evaluates to zero ^ +Warning 3083 - Field length must be non-zero ^ badcode.asl 84: Acquire (MTX1, 100) Warning 3130 - ^ Result is not used, possible operator timeout will be missed @@ -256,11 +256,11 @@ Warning 3144 - ^ Method Local is set but never used Intel ACPI Component Architecture ASL+ Optimizing Compiler/Disassembler version VVVVVVVV -Copyright (c) 2000 - 2018 Intel Corporation +Copyright (c) 2000 - 2019 Intel Corporation Ignoring all errors, forcing AML file generation -ASL Input: badcode.asl - 408 lines, 11587 bytes, 81 keywords -AML Output: badcode.aml - 1195 bytes, 61 named objects, 20 executable opcodes +ASL Input: badcode.asl - 11587 bytes 81 keywords 408 source lines +AML Output: badcode.aml - 1195 bytes 20 opcodes 61 named objects -Compilation complete. 46 Errors, 28 Warnings, 11 Remarks, 16 Optimizations, 1 Constants Folded +Compilation successful. 45 Errors, 29 Warnings, 11 Remarks, 16 Optimizations, 1 Constants Folded diff --git a/tests/converterSample/converterSample.asl.result b/tests/converterSample/converterSample.asl.result index dcc98cb..fd63f11 100644 --- a/tests/converterSample/converterSample.asl.result +++ b/tests/converterSample/converterSample.asl.result @@ -10,12 +10,15 @@ Remark 2120 - ^ Control Method should be made Seriali converterSample.asl 68: Name (a1, 0x04) Remark 2089 - Object is not referenced ^ (Name [A1__] is within a method [SCOP]) +converterSample.asl 76: Offset(0),//c37 +Remark 2158 - ^ Unnecessary/redundant use of Offset operator + Intel ACPI Component Architecture ASL+ Optimizing Compiler/Disassembler version VVVVVVVV -Copyright (c) 2000 - 2018 Intel Corporation +Copyright (c) 2000 - 2019 Intel Corporation -ASL Input: converterSample.asl - 85 lines, 1968 bytes, 11 keywords -AML Output: converterSample.aml - 180 bytes, 9 named objects, 2 executable opcodes +ASL Input: converterSample.asl - 1968 bytes 11 keywords 85 source lines +AML Output: converterSample.aml - 180 bytes 2 opcodes 9 named objects -Compilation complete. 0 Errors, 0 Warnings, 4 Remarks, 11 Optimizations, 1 Constants Folded +Compilation successful. 0 Errors, 0 Warnings, 5 Remarks, 12 Optimizations, 1 Constants Folded diff --git a/tests/grammar/grammar.asl.result b/tests/grammar/grammar.asl.result index f63e0f5..2e1dd4d 100644 --- a/tests/grammar/grammar.asl.result +++ b/tests/grammar/grammar.asl.result @@ -1,3 +1,10 @@ +ACPI Warning: NsLookup: Type mismatch on GIDX (RegionField), searching for (Region) (20190509/nsaccess-728) +ACPI Warning: NsLookup: Type mismatch on IDX2 (RegionField), searching for (Region) (20190509/nsaccess-728) +ACPI Warning: NsLookup: Type mismatch on INDX (RegionField), searching for (Region) (20190509/nsaccess-728) +ACPI Warning: NsLookup: Type mismatch on AIDX (RegionField), searching for (Region) (20190509/nsaccess-728) +ACPI Warning: NsLookup: Type mismatch on C05D (RegionField), searching for (Region) (20190509/nsaccess-728) +ACPI Warning: NsLookup: Type mismatch on INDX (RegionField), searching for (Region) (20190509/nsaccess-728) +ACPI Warning: NsLookup: Type mismatch on IND2 (RegionField), searching for (Region) (20190509/nsaccess-728) grammar.asl 120: Device (A1) Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) @@ -364,11 +371,11 @@ Warning 3141 - Missing dependency ^ (Device object requires a _HID or _ADR i Intel ACPI Component Architecture ASL+ Optimizing Compiler/Disassembler version VVVVVVVV -Copyright (c) 2000 - 2018 Intel Corporation +Copyright (c) 2000 - 2019 Intel Corporation Ignoring all errors, forcing AML file generation -ASL Input: grammar.asl - 10284 lines, 323650 bytes, 4818 keywords -AML Output: grammar.aml - 43469 bytes, 670 named objects, 4148 executable opcodes +ASL Input: grammar.asl - 323650 bytes 4818 keywords 10284 source lines +AML Output: grammar.aml - 43469 bytes 4148 opcodes 670 named objects -Compilation complete. 6 Errors, 88 Warnings, 27 Remarks, 1232 Optimizations, 75 Constants Folded +Compilation successful. 6 Errors, 88 Warnings, 27 Remarks, 1232 Optimizations, 75 Constants Folded diff --git a/tests/grammar2/grammar2.asl.result b/tests/grammar2/grammar2.asl.result index 67ce8f7..12e5304 100644 --- a/tests/grammar2/grammar2.asl.result +++ b/tests/grammar2/grammar2.asl.result @@ -1,3 +1,10 @@ +ACPI Warning: NsLookup: Type mismatch on GIDX (RegionField), searching for (Region) (20190509/nsaccess-728) +ACPI Warning: NsLookup: Type mismatch on IDX2 (RegionField), searching for (Region) (20190509/nsaccess-728) +ACPI Warning: NsLookup: Type mismatch on INDX (RegionField), searching for (Region) (20190509/nsaccess-728) +ACPI Warning: NsLookup: Type mismatch on AIDX (RegionField), searching for (Region) (20190509/nsaccess-728) +ACPI Warning: NsLookup: Type mismatch on C05D (RegionField), searching for (Region) (20190509/nsaccess-728) +ACPI Warning: NsLookup: Type mismatch on INDX (RegionField), searching for (Region) (20190509/nsaccess-728) +ACPI Warning: NsLookup: Type mismatch on IND2 (RegionField), searching for (Region) (20190509/nsaccess-728) grammar2.asl 106: Device (A1) Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) @@ -357,12 +364,12 @@ Warning 3141 - Missing dependency ^ (Device object requires a _HID or _ADR Intel ACPI Component Architecture -ASL+ Optimizing Compiler/Disassembler version 20180508 -Copyright (c) 2000 - 2018 Intel Corporation +ASL+ Optimizing Compiler/Disassembler version VVVVVVVV +Copyright (c) 2000 - 2019 Intel Corporation Ignoring all errors, forcing AML file generation -ASL Input: grammar2.asl - 11654 lines, 378020 bytes, 4899 keywords -AML Output: grammar2.aml - 43758 bytes, 670 named objects, 4229 executable opcodes +ASL Input: grammar2.asl - 378020 bytes 4899 keywords 11654 source lines +AML Output: grammar2.aml - 43758 bytes 4229 opcodes 670 named objects -Compilation complete. 6 Errors, 86 Warnings, 27 Remarks, 1109 Optimizations +Compilation successful. 6 Errors, 86 Warnings, 27 Remarks, 1109 Optimizations diff --git a/tests/test_badcode.yml b/tests/test_badcode.yml index 96663e9..62554dd 100644 --- a/tests/test_badcode.yml +++ b/tests/test_badcode.yml @@ -1,8 +1,14 @@ - hosts: localhost vars: - - artifacts: ./artifacts + - artifacts: "{{ lookup('env', 'TEST_ARTIFACTS')|default('./artifacts', true) }}" tags: - classic + roles: + - role: standard-test-basic + tests: + - badcode + required_packages: + - acpica-tools remote_user: root tasks: - name: badcode @@ -11,18 +17,12 @@ shell: exec > /tmp/badcode.test.log 2>&1 && ./badcode/runtest.sh always: - - name: pull out logs + - name: pull out results fetch: dest: "{{ artifacts }}/" - src: "/tmp/badcode.test.log" - flat: yes - - name: pull out expected - fetch: - dest: "{{ artifacts }}/" - src: "./badcode/badcode.asl.expected" - flat: yes - - name: pull out actual - fetch: - dest: "{{ artifacts }}/" - src: "./badcode/badcode.asl.actual" + src: "{{ item }}" flat: yes + with_items: + - /tmp/badcode.test.log + - ./badcode/badcode.asl.expected + - ./badcode/badcode.asl.actual diff --git a/tests/test_converterSample.yml b/tests/test_converterSample.yml index c4b0036..7a8c134 100644 --- a/tests/test_converterSample.yml +++ b/tests/test_converterSample.yml @@ -1,8 +1,14 @@ - hosts: localhost vars: - - artifacts: ./artifacts + - artifacts: "{{ lookup('env', 'TEST_ARTIFACTS')|default('./artifacts', true) }}" tags: - classic + roles: + - role: standard-test-basic + tests: + - converterSample + required_packages: + - acpica-tools remote_user: root tasks: - name: converterSample @@ -11,18 +17,12 @@ shell: exec > /tmp/converterSample.test.log 2>&1 && ./converterSample/runtest.sh always: - - name: pull out logs + - name: pull out results fetch: dest: "{{ artifacts }}/" - src: "/tmp/converterSample.test.log" - flat: yes - - name: pull out expected - fetch: - dest: "{{ artifacts }}/" - src: "./converterSample/converterSample.asl.expected" - flat: yes - - name: pull out actual - fetch: - dest: "{{ artifacts }}/" - src: "./converterSample/converterSample.asl.actual" + src: "{{ item }}" flat: yes + with_items: + - /tmp/converterSample.test.log + - ./converterSample/converterSample.asl.expected + - ./converterSample/converterSample.asl.actual diff --git a/tests/test_grammar.yml b/tests/test_grammar.yml index 3c149fc..cddb08b 100644 --- a/tests/test_grammar.yml +++ b/tests/test_grammar.yml @@ -1,8 +1,14 @@ - hosts: localhost vars: - - artifacts: ./artifacts + - artifacts: "{{ lookup('env', 'TEST_ARTIFACTS')|default('./artifacts', true) }}" tags: - classic + roles: + - role: standard-test-basic + tests: + - grammar + required_packages: + - acpica-tools remote_user: root tasks: - name: grammar @@ -11,18 +17,12 @@ shell: exec > /tmp/grammar.test.log 2>&1 && ./grammar/runtest.sh always: - - name: pull out logs + - name: pull out results fetch: dest: "{{ artifacts }}/" - src: "/tmp/grammar.test.log" - flat: yes - - name: pull out expected - fetch: - dest: "{{ artifacts }}/" - src: "./grammar/grammar.asl.expected" - flat: yes - - name: pull out actual - fetch: - dest: "{{ artifacts }}/" - src: "./grammar/grammar.asl.actual" + src: "{{ item }}" flat: yes + with_items: + - /tmp/grammar.test.log + - ./grammar/grammar.asl.expected + - ./grammar/grammar.asl.actual diff --git a/tests/test_grammar2.yml b/tests/test_grammar2.yml index 7d76f0a..5ccacf8 100644 --- a/tests/test_grammar2.yml +++ b/tests/test_grammar2.yml @@ -1,8 +1,14 @@ - hosts: localhost vars: - - artifacts: ./artifacts + - artifacts: "{{ lookup('env', 'TEST_ARTIFACTS')|default('./artifacts', true) }}" tags: - classic + roles: + - role: standard-test-basic + tests: + - grammar2 + required_packages: + - acpica-tools remote_user: root tasks: - name: grammar2 @@ -11,18 +17,12 @@ shell: exec > /tmp/grammar2.test.log 2>&1 && ./grammar2/runtest.sh always: - - name: pull out logs + - name: pull out results fetch: dest: "{{ artifacts }}/" - src: "/tmp/grammar2.test.log" - flat: yes - - name: pull out expected - fetch: - dest: "{{ artifacts }}/" - src: "./grammar2/grammar2.asl.expected" - flat: yes - - name: pull out actual - fetch: - dest: "{{ artifacts }}/" - src: "./grammar2/grammar2.asl.actual" + src: "{{ item }}" flat: yes + with_items: + - /tmp/grammar2.test.log + - ./grammar2/grammar2.asl.expected + - ./grammar2/grammar2.asl.actual