Revert "Merge remote branch 'cros/upstream' into autotest-rebase"

This reverts commit 7edb30498d75a29a3287fe07070f2b51a116c5d4.

TEST=Built for tegra2_seaboard
BUG=10756

Review URL: http://codereview.chromium.org/6124004

Change-Id: Ifcd1a2279f5a62b99552a8f961c1430889a3a928
diff --git a/client/samples/filesystem b/client/samples/filesystem
new file mode 100644
index 0000000..2fd1b9d
--- /dev/null
+++ b/client/samples/filesystem
@@ -0,0 +1,25 @@
+# Uncomment this line, and replace the device with something sensible
+# for you ...
+# fs = job.partition('/dev/hda2', job.tmpdir)
+# or ...
+
+part = job.partition('/tmp/looped', 1024, job.tmpdir)
+
+# dbench 1024, ltp, 1024-byte blocksize, a few other things.  Lots of fscking.
+# I haven't tested nobh mode yet, 
+# and I have yet to point run-bash-shared-mapping at it.
+# (different mount options for ext3)
+
+def test_fs():
+	part.mkfs(fstype)
+	part.mount()
+	try:
+		job.run_test('fsx', dir=part.mountpoint, tag=fstype)
+		job.run_test('iozone', dir=part.mountpoint, tag=fstype)
+		job.run_test('dbench', dir=part.mountpoint, tag=fstype)
+	finally:
+		part.unmount()
+		part.fsck()
+
+for fstype in ('ext2', 'ext3', 'jfs', 'xfs', 'reiserfs'):
+	job.run_group(test_fs)