[diffoscope] 01/01: Also update dex tests for openjdk-9 re. #893183

[Chris Lamb]

This is an automated email from the git hooks/post-receive script.

lamby pushed a commit to branch master
in repository diffoscope.

commit 026953654448426efd67a3d44b29bf3947089d4e
Author: Chris Lamb <lamby at debian.org>
Date:   Sat Mar 17 21:44:20 2018 -0400

    Also update dex tests for openjdk-9 re. #893183
---
 tests/comparators/test_dex.py | 2 +-
 tests/data/dex_expected_diffs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/comparators/test_dex.py b/tests/comparators/test_dex.py
index 7565c81..aad6e15 100644
--- a/tests/comparators/test_dex.py
+++ b/tests/comparators/test_dex.py
@@ -61,7 +61,7 @@ def differences(dex1, dex2):
 
 
 @skip_unless_tools_exist('enjarify', 'zipinfo', 'javap')
- at skip_unless_tool_is_at_least('javap', javap_version, '1.8')
+ at skip_unless_tool_is_at_least('javap', javap_version, '9.0.4')
 @skip_unless_tool_is_at_least('enjarify', enjarify_version, '1.0.3')
 def test_differences(differences):
     assert differences[0].source1 == 'test1.jar'
diff --git a/tests/data/dex_expected_diffs b/tests/data/dex_expected_diffs
index 822c9cd..58e8b97 100644
--- a/tests/data/dex_expected_diffs
+++ b/tests/data/dex_expected_diffs
@@ -15,7 +15,7 @@
    length of file comment:                         0 characters
    disk number on which file begins:               disk 1
    apparent file type:                             binary
-@@ -17,16 +17,16 @@
+@@ -20,16 +20,16 @@
    #12 = Methodref          #4.#11         // android/app/Activity.onCreate:(Landroid/os/Bundle;)V
    #13 = Integer            2130903040
    #14 = Float              1.7412887E38f
@@ -31,6 +31,6 @@
  {
    public com.example.MainActivity();
      descriptor: ()V
-     flags: ACC_PUBLIC
+     flags: (0x0001) ACC_PUBLIC
      Code:
        stack=300, locals=1, args_size=1

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/diffoscope.git