mirror of
				https://xff.cz/git/u-boot/
				synced 2025-10-31 10:26:10 +01:00 
			
		
		
		
	test: test for ignore OsIndications
The tests we currently have expect the firmware update to fail when OsIndications is not set properly. However, we have a Kconfig flag that explicitly ignores that variable. Adjust the tests accordingly Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
This commit is contained in:
		
				
					committed by
					
						 Heinrich Schuchardt
						Heinrich Schuchardt
					
				
			
			
				
	
			
			
			
						parent
						
							0250f84d3a
						
					
				
				
					commit
					e6003091db
				
			| @@ -76,7 +76,7 @@ class TestEfiCapsuleFirmwareRaw: | |||||||
|             self, u_boot_config, u_boot_console, efi_capsule_data): |             self, u_boot_config, u_boot_console, efi_capsule_data): | ||||||
|         """ Test Case 2 |         """ Test Case 2 | ||||||
|         Update U-Boot and U-Boot environment on SPI Flash but with OsIndications unset |         Update U-Boot and U-Boot environment on SPI Flash but with OsIndications unset | ||||||
|         No update should happen |         No update should happen unless CONFIG_EFI_IGNORE_OSINDICATIONS is set | ||||||
|         0x100000-0x150000: U-Boot binary (but dummy) |         0x100000-0x150000: U-Boot binary (but dummy) | ||||||
|         0x150000-0x200000: U-Boot environment (but dummy) |         0x150000-0x200000: U-Boot environment (but dummy) | ||||||
|         """ |         """ | ||||||
| @@ -91,16 +91,27 @@ class TestEfiCapsuleFirmwareRaw: | |||||||
|         # reboot |         # reboot | ||||||
|         u_boot_console.restart_uboot() |         u_boot_console.restart_uboot() | ||||||
|  |  | ||||||
|  |         ignore_os_indications = u_boot_config.buildconfig.get( | ||||||
|  |             'config_efi_ignore_osindications') | ||||||
|  |         need_reboot = True if ignore_os_indications else False | ||||||
|  |  | ||||||
|  |         capsule_auth = u_boot_config.buildconfig.get( | ||||||
|  |             'config_efi_capsule_authenticate') | ||||||
|  |  | ||||||
|         capsule_early = u_boot_config.buildconfig.get( |         capsule_early = u_boot_config.buildconfig.get( | ||||||
|             'config_efi_capsule_on_disk_early') |             'config_efi_capsule_on_disk_early') | ||||||
|         with u_boot_console.log.section('Test Case 2-b, after reboot'): |         with u_boot_console.log.section('Test Case 2-b, after reboot'): | ||||||
|             if not capsule_early: |             if not capsule_early: | ||||||
|                 exec_manual_update(u_boot_console, disk_img, capsule_files, False) |                 exec_manual_update(u_boot_console, disk_img, capsule_files, need_reboot) | ||||||
|  |  | ||||||
|             check_file_exist(u_boot_console, disk_img, capsule_files) |             if not ignore_os_indications: | ||||||
|  |                 check_file_exist(u_boot_console, disk_img, capsule_files) | ||||||
|  |  | ||||||
|             verify_content(u_boot_console, '100000', 'u-boot:Old') |             expected = 'u-boot:New' if (ignore_os_indications and not capsule_auth) else 'u-boot:Old' | ||||||
|             verify_content(u_boot_console, '150000', 'u-boot-env:Old') |             verify_content(u_boot_console, '100000', expected) | ||||||
|  |  | ||||||
|  |             expected = 'u-boot-env:New' if (ignore_os_indications and not capsule_auth) else 'u-boot-env:Old' | ||||||
|  |             verify_content(u_boot_console, '150000', expected) | ||||||
|  |  | ||||||
|     def test_efi_capsule_fw3( |     def test_efi_capsule_fw3( | ||||||
|             self, u_boot_config, u_boot_console, efi_capsule_data): |             self, u_boot_config, u_boot_console, efi_capsule_data): | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user