Merge remote branch 'cros/upstream' into tempbranch

client/samples/test_add_kernel

Index: client/samples/test_add_kernel
diff --git a/client/samples/test_add_kernel b/client/samples/test_add_kernel
deleted file mode 100644
index e6cae506ee58cc180152df0b7277b1ac4134f4ac..0000000000000000000000000000000000000000
--- a/client/samples/test_add_kernel
+++ /dev/null
@@ -1,19 +0,0 @@
-print "TEST: initing kernel"
-testkernel = job.kernel('/usr/local/src/linux-2.6.14.tar.bz2') # '2.6.14'
-testkernel.patch('/usr/local/src/patch-2.6.14-git6.bz2')
-testkernel.config('http://ftp.kernel.org/pub/linux/kernel/people/mbligh/config/config.up')
-
-print "TEST: building kernel"
-testkernel.build()
-
-print "TEST: installing kernel"
-testkernel.install('autotest')
-
-print "TEST: adding kernel to bootloader"
-testkernel.add_to_bootloader('autotest') # using default boot args (/proc/cmdline)
-
-print "TEST: listing bootloader entries"
-job.bootloader.list_titles()
-
-print "TEST: initing kernbench"
-job.run_test('kernbench', iterations=2, threads=5)