Merge lp:~zmanji/ecryptfs/1270455 into lp:ecryptfs

[Zameer Manji]

This fixes Launchpad Bug 1270455 by allowing the tester to pass arbitrary mount flags to the test runner.

[Tyler Hicks (tyhicks)]

Hi Zameer - I apologize for it taking so long for us to get to this merge proposal. I'm slowly trying to get on top of outstanding maintenance tasks.

This is a simple and needed change, but I don't want to add an option to run_tests.sh at this point. There are a very small number of people that would ever want to change the test mount options and the command line options of run_test.sh are getting more complex than I would like.

Additionally, I think users of run_tests.sh would expect the -o flag to be used to set the mount options, not append an option. One may also just want to replace or change an existing default mount option. I think we need to give it a little more thought before we use the -o option...

You can currently overwrite the default test mount options by setting the ETL_MOUNT_OPTS environment variable. However, that doesn't solve your problem because you want to simply append an additional mount option onto the list of defaults. So, I propose that we create a new environment variable, ETL_APPENDED_MOUNT_OPTS, that can be set when running the tests.

I've created a merge proposal here:

https://code.launchpad.net/~tyhicks/ecryptfs/lp1270455/+merge/226229

review: Disapprove

Unmerged revisions

825. By Zameer Manji on 2014-01-18

Adding -o flags option to pass arbitrary flags to ecryptfs through the test harness.

=== modified file 'tests/lib/etl_funcs.sh'
--- tests/lib/etl_funcs.sh	2013-01-14 13:53:10 +0000
+++ tests/lib/etl_funcs.sh	2014-01-18 17:13:47 +0000
@@ -32,7 +32,7 @@
 default_ext2_opts="user_xattr,acl"
 default_ext3_opts="user_xattr,acl,commit=600,barrier=1,data=ordered"
 default_btrfs_opts="nodatacow"
-default_mount_opts="rw,relatime,ecryptfs_cipher=aes,ecryptfs_key_bytes=16,ecryptfs_sig=\${ETL_FEKEK_SIG}"
+default_mount_opts="rw,relatime,ecryptfs_cipher=aes,ecryptfs_key_bytes=16,ecryptfs_sig=\${ETL_FEKEK_SIG}${ETL_EXTRA_MOUNT_FLAGS}"
 default_fne_mount_opts="${default_mount_opts},ecryptfs_fnek_sig=\${ETL_FNEK_SIG}"
 
 

=== modified file 'tests/run_tests.sh'
--- tests/run_tests.sh	2012-04-23 07:32:26 +0000
+++ tests/run_tests.sh	2014-01-18 17:13:47 +0000
@@ -159,9 +159,10 @@
 	echo "  -t tests	comma-separated list of tests to run"
 	echo "  -U		run tests relating to the userspace utilities"
 	echo "  -u upper_mnt	destination path to mount upper filesystem"
+	echo "  -o flags	extra mount options to be passed to ecryptfs"
 }
 
-while getopts "b:c:D:d:f:hKl:t:Uu:" opt; do
+while getopts "b:c:D:d:f:hKl:t:Uu:o:" opt; do
 	case $opt in
 	b)
 		blocks=$OPTARG
@@ -195,6 +196,9 @@
 	U)
 		userspace=true
 		;;
+	o)
+		extra_flags=$OPTARG
+		;;
 	u)
 		upper_mnt=$OPTARG
 		;;
@@ -300,6 +304,13 @@
 fi
 export ETL_MOUNT_DST=$upper_mnt
 
+if [ -n "$extra_flags" ] ; then
+	export ETL_EXTRA_MOUNT_FLAGS=",${extra_flags}"
+else
+	export ETL_EXTRA_MOUNT_FLAGS=""
+fi
++
+
 # Source in the kernel and/or userspace tests.rc files to build the test lists
 categories=$(echo $categories | tr ',' ' ')
 if $kernel ; then