Merge lp:~fagerstedt-axel/lava-android-test/ashmemtestexpanded into lp:lava-android-test

[Axel Fagerstedt]

Take two on adding the expanded ashmem test.

Expanded the existing LAVA wrapper to run both tests instead of adding a separate wrapper.

[Andy Doan (doanac)]

+1

thanks for re-working this :)

=== modified file 'lava_android_test/test_definitions/commands/ashmemtest.py'
--- lava_android_test/test_definitions/commands/ashmemtest.py	2013-01-18 14:11:16 +0000
+++ lava_android_test/test_definitions/commands/ashmemtest.py	2013-02-01 17:17:25 +0000
@@ -18,7 +18,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
-This is basic unit test for the ashmem driver.
+Runs the basic and expanded unit tests for the ashmem driver.
 
 **URL:**  None
 
@@ -28,5 +28,5 @@
 
 test_name = 'ashmem'
 
-RUN_ADB_SHELL_STEPS = ['ashmemtest']
+RUN_ADB_SHELL_STEPS = ['ashmemtest', 'ashmemtest-expanded-runner.sh']
 PATTERN = "\s*\[(?P<test_case_id>\w+)\]:\s\w+\s(?P<result>\w+)"