From fe14b4917807e80b975a32ad0d3815f6baf3251b Mon Sep 17 00:00:00 2001
From: cfig <yuyezhong@gmail.com>
Date: Sat, 13 Apr 2019 00:51:49 +0800
Subject: [PATCH] add submodule for integrationTest resources

---
 .gitmodules                   |  3 +++
 README.md                     |  3 +++
 integrationTest.py            | 24 ++++++++++++++----------
 src/integrationTest/resources |  1 +
 4 files changed, 21 insertions(+), 10 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 src/integrationTest/resources

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..3ec7b5c
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "src/integrationTest/resources"]
+	path = src/integrationTest/resources
+	url = https://github.com/cfig/boot_image_res.git
diff --git a/README.md b/README.md
index f18918a..656a91a 100644
--- a/README.md
+++ b/README.md
@@ -92,5 +92,8 @@ https://android.googlesource.com/platform/system/core
 AVB
 https://android.googlesource.com/platform/external/avb/
 
+mkbootimg
+https://android.googlesource.com/platform/system/core/+/master/mkbootimg/
+
 Android version list
 https://source.android.com/source/build-numbers.html
diff --git a/integrationTest.py b/integrationTest.py
index dd11cf8..16e1681 100755
--- a/integrationTest.py
+++ b/integrationTest.py
@@ -49,19 +49,23 @@ def verifySingleDir(inResourceDir, inImageDir):
     for jsonFile in jsonFiles:
         verifySingleJson(inResourceDir, inImageDir, jsonFile)
 
+resDir = "src/integrationTest/resources"
 # 5.0
-verifySingleDir("boot_image_res", "5.0_fugu_lrx21m")
+verifySingleDir(resDir, "5.0_fugu_lrx21m")
 # 6.0
-verifySingleDir("boot_image_res", "6.0.0_bullhead_mda89e")
+verifySingleDir(resDir, "6.0.0_bullhead_mda89e")
 # 7.0 special boot
-subprocess.check_call("dd if=boot_image_res/7.1.1_volantis_n9f27m/boot.img of=boot.img bs=256 skip=1", shell = True)
-verifySingleJson("boot_image_res", "7.1.1_volantis_n9f27m", "boot_image_res/7.1.1_volantis_n9f27m/boot.json")
+subprocess.check_call("dd if=%s/7.1.1_volantis_n9f27m/boot.img of=boot.img bs=256 skip=1" % resDir, shell = True)
+verifySingleJson(resDir, "7.1.1_volantis_n9f27m", "%s/7.1.1_volantis_n9f27m/boot.json" % resDir)
 # 7.0 special recovery
-subprocess.check_call("dd if=boot_image_res/7.1.1_volantis_n9f27m/recovery.img of=recovery.img bs=256 skip=1", shell = True)
-verifySingleJson("boot_image_res", "7.1.1_volantis_n9f27m", "boot_image_res/7.1.1_volantis_n9f27m/recovery.json")
+subprocess.check_call("dd if=%s/7.1.1_volantis_n9f27m/recovery.img of=recovery.img bs=256 skip=1" % resDir, shell = True)
+verifySingleJson(resDir, "7.1.1_volantis_n9f27m", "%s/7.1.1_volantis_n9f27m/recovery.json" % resDir)
 # 8.0
-verifySingleDir("boot_image_res", "8.0.0_fugu_opr2.170623.027")
+verifySingleDir(resDir, "8.0.0_fugu_opr2.170623.027")
 # 9.0 + avb
-subprocess.check_call("tar xf boot_image_res/9.0.0_blueline_pq1a.181105.017.a1/boot.img.tar.gz", shell = True)
-verifySingleJson("boot_image_res", "9.0.0_blueline_pq1a.181105.017.a1", "boot_image_res/9.0.0_blueline_pq1a.181105.017.a1/boot.json")
-verifySingleJson("boot_image_res", "9.0.0_blueline_pq1a.181105.017.a1", "boot_image_res/9.0.0_blueline_pq1a.181105.017.a1/vbmeta.json")
+subprocess.check_call("tar xf %s/9.0.0_blueline_pq1a.181105.017.a1/boot.img.tar.gz" % resDir, shell = True)
+verifySingleJson(resDir, "9.0.0_blueline_pq1a.181105.017.a1", "%s/9.0.0_blueline_pq1a.181105.017.a1/boot.json" % resDir)
+verifySingleJson(resDir, "9.0.0_blueline_pq1a.181105.017.a1", "%s/9.0.0_blueline_pq1a.181105.017.a1/vbmeta.json" % resDir)
+
+# from volunteers
+verifySingleDir(resDir, "recovery_image_from_s-trace")
diff --git a/src/integrationTest/resources b/src/integrationTest/resources
new file mode 160000
index 0000000..c595bc0
--- /dev/null
+++ b/src/integrationTest/resources
@@ -0,0 +1 @@
+Subproject commit c595bc039cb618e505b579bab04e58970910f99c