Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b475973 authored by Makoto Onuki's avatar Makoto Onuki
Browse files

Remove byte code offset from golden files. 

The byte code offsets can easily change if generated code changes, so let's
just remove them. The offsets are not important anyway.

Test: ./scripts/run-all-tests.sh
Bug: 292141694
Change-Id: I4bd62ff3fd3993de3b225d8078c26f1090288db3
parent 427db233

tools/hoststubgen/hoststubgen/test-tiny-framework/golden-output/01-hoststubgen-test-tiny-framework-orig-dump.txt

+340 −340

File changed.

Preview size limit exceeded, changes collapsed.

tools/hoststubgen/hoststubgen/test-tiny-framework/golden-output/02-hoststubgen-test-tiny-framework-host-stub-dump.txt

+256 −256

File changed.

Preview size limit exceeded, changes collapsed.

tools/hoststubgen/hoststubgen/test-tiny-framework/golden-output/03-hoststubgen-test-tiny-framework-host-impl-dump.txt

+484 −484

File changed.

Preview size limit exceeded, changes collapsed.

tools/hoststubgen/scripts/dump-jar

+2 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ filter_output() { 
  if (( $simple )) ; then

    # For "simple output" mode,

    # - Normalize the constant numbers (replace with "#x")

    # - Normalize byte code offsets and other similar numbers. (e.g. "0:" -> "x:")

    # - Remove the constant pool

    # - Remove the line number table

    # - Some other transient lines
@@ -100,6 +101,7 @@ filter_output() { 
    # `/PATTERN-1/,/PATTERN-1/{//!d}` is a trick to delete lines between two patterns, without

    # the start and the end lines.

    sed -e 's/#[0-9][0-9]*/#x/g' \

        -e 's/^\( *\)[0-9][0-9]*:/\1x:/' \

        -e '/^Constant pool:/,/^[^ ]/{//!d}' \

        -e '/^ *line *[0-9][0-9]*: *[0-9][0-9]*$/d' \

        -e '/SHA-256 checksum/d' \