Panic prebuilt etc module gen test if module isn't PrebuiltEtc
Test: m --no-skip-soong-tests
Change-Id: Idda28cf77d9f95fde5542a73dbbe633b1f55fcf9
diff --git a/fsgen/filesystem_creator_test.go b/fsgen/filesystem_creator_test.go
index 8f6b4b8..2c4d3c8 100644
--- a/fsgen/filesystem_creator_test.go
+++ b/fsgen/filesystem_creator_test.go
@@ -329,7 +329,7 @@
// check generated prebuilt_* module type install path and install partition
generatedModule := result.ModuleForTests(t, "system-frameworks_base_config-etc-0", "android_arm64_armv8-a").Module()
- etcModule, _ := generatedModule.(*etc.PrebuiltEtc)
+ etcModule := generatedModule.(*etc.PrebuiltEtc)
android.AssertStringEquals(
t,
"module expected to have etc install path",
@@ -347,7 +347,7 @@
// check generated prebuilt_* module specifies correct relative_install_path property
generatedModule = result.ModuleForTests(t, "system-frameworks_base_data_keyboards-usr_keylayout_subdir-0", "android_arm64_armv8-a").Module()
- etcModule, _ = generatedModule.(*etc.PrebuiltEtc)
+ etcModule = generatedModule.(*etc.PrebuiltEtc)
android.AssertStringEquals(
t,
"module expected to set correct relative_install_path properties",
@@ -495,7 +495,7 @@
)
// check generated prebuilt_* module specifies correct install path and relative install path
- etcModule, _ = generatedModule1.(*etc.PrebuiltEtc)
+ etcModule = generatedModule1.(*etc.PrebuiltEtc)
android.AssertStringEquals(
t,
"module expected to have . install path",
@@ -530,7 +530,7 @@
generatedModule1 = result.ModuleForTests(t, "recovery-device_sample_firmware-1", "android_recovery_common").Module()
// check generated prebuilt_* module specifies correct install path and relative install path
- etcModule, _ = generatedModule0.(*etc.PrebuiltEtc)
+ etcModule = generatedModule0.(*etc.PrebuiltEtc)
android.AssertStringEquals(
t,
"module expected to have . install path",
@@ -562,7 +562,7 @@
)
// check generated prebuilt_* module specifies correct install path and relative install path
- etcModule, _ = generatedModule1.(*etc.PrebuiltEtc)
+ etcModule = generatedModule1.(*etc.PrebuiltEtc)
android.AssertStringEquals(
t,
"module expected to have . install path",
@@ -597,7 +597,7 @@
generatedModule1 = result.ModuleForTests(t, "recovery-device_sample_firmware-lib_firmware-1", "android_recovery_common").Module()
// check generated prebuilt_* module specifies correct install path and relative install path
- etcModule, _ = generatedModule0.(*etc.PrebuiltEtc)
+ etcModule = generatedModule0.(*etc.PrebuiltEtc)
android.AssertStringEquals(
t,
"module expected to have . install path",
@@ -629,7 +629,7 @@
)
// check generated prebuilt_* module specifies correct install path and relative install path
- etcModule, _ = generatedModule1.(*etc.PrebuiltEtc)
+ etcModule = generatedModule1.(*etc.PrebuiltEtc)
android.AssertStringEquals(
t,
"module expected to have . install path",