Use pre-generated ext image instead of create it on the fly.
mkfs.ext3 is not available in target device, so we don't use it.
Also removed all usage of dd.
This fixes a UtilsTest and the first step of integration test, the rest is
still failing because bsdiff is missing.
Test: ./update_engine_unittests
Test: cros_workon_make update_engine --test
Bug: 26955860
Change-Id: Ic600bd6fab1d6839f38d5ef767fbffc5a35571a4
diff --git a/sample_images/generate_images.sh b/sample_images/generate_images.sh
index b461175..ed5e00d 100755
--- a/sample_images/generate_images.sh
+++ b/sample_images/generate_images.sh
@@ -87,6 +87,12 @@
echo "foo" | sudo tee "${mntdir}"/dir1/dir2/file >/dev/null
echo "bar" | sudo tee "${mntdir}"/dir1/file >/dev/null
+ # FIFO
+ sudo mkfifo "${mntdir}"/fifo
+
+ # character special file
+ sudo mknod "${mntdir}"/cdev c 2 3
+
# removed: removed files that should not be listed.
echo "We will remove this file so it's contents will be somewhere in the " \
"empty space data but it won't be all zeros." |
@@ -236,8 +242,8 @@
main() {
# Add more sample images here.
- generate_image disk_ext2_1k default 16777216 1024
- generate_image disk_ext2_4k default 16777216 4096
+ generate_image disk_ext2_1k default $((1024 * 1024)) 1024
+ generate_image disk_ext2_4k default $((1024 * 4096)) 4096
generate_image disk_ext2_4k_empty empty $((1024 * 4096)) 4096
generate_image disk_ext2_unittest unittest $((1024 * 4096)) 4096
diff --git a/sample_images/sample_images.tar.bz2 b/sample_images/sample_images.tar.bz2
index 20a698b..e614dd7 100644
--- a/sample_images/sample_images.tar.bz2
+++ b/sample_images/sample_images.tar.bz2
Binary files differ