From 9e7f2940ff02f6784e186503e4c158cb878cf42c Mon Sep 17 00:00:00 2001
From: Ajay Kishore <ajay.kishore@intel.com>
Date: Thu, 4 Oct 2018 18:00:42 +0530
Subject: [PATCH] samples: USB mass storage sample.yaml cleanup

Add console harness support for USB mass storage test.
Also, using overlay config for DISK_ACCESS configuration
and accessing the different config file with different
method.

Signed-off-by: Ajay Kishore <ajay.kishore@intel.com>
Signed-off-by: Anas Nashif <anas.nashif@intel.com>
---
 .../subsys/usb/mass/overlay-flash-disk.conf   |  4 ++++
 samples/subsys/usb/mass/overlay-ram-disk.conf |  3 +++
 samples/subsys/usb/mass/prj.conf              |  9 --------
 samples/subsys/usb/mass/sample.yaml           | 21 ++++++++++++++++++-
 4 files changed, 27 insertions(+), 10 deletions(-)
 create mode 100644 samples/subsys/usb/mass/overlay-flash-disk.conf
 create mode 100644 samples/subsys/usb/mass/overlay-ram-disk.conf

diff --git a/samples/subsys/usb/mass/overlay-flash-disk.conf b/samples/subsys/usb/mass/overlay-flash-disk.conf
new file mode 100644
index 00000000000..d95ffc83382
--- /dev/null
+++ b/samples/subsys/usb/mass/overlay-flash-disk.conf
@@ -0,0 +1,4 @@
+# config to disk access over SPI flash
+CONFIG_DISK_ACCESS_FLASH=y
+CONFIG_MASS_STORAGE_DISK_NAME="NAND"
+CONFIG_SPI=y
diff --git a/samples/subsys/usb/mass/overlay-ram-disk.conf b/samples/subsys/usb/mass/overlay-ram-disk.conf
new file mode 100644
index 00000000000..0f9c0ad6906
--- /dev/null
+++ b/samples/subsys/usb/mass/overlay-ram-disk.conf
@@ -0,0 +1,3 @@
+# config to disk access over RAM
+CONFIG_DISK_ACCESS_RAM=y
+CONFIG_MASS_STORAGE_DISK_NAME="RAM"
diff --git a/samples/subsys/usb/mass/prj.conf b/samples/subsys/usb/mass/prj.conf
index e13cd0f71e3..6428d785f5f 100644
--- a/samples/subsys/usb/mass/prj.conf
+++ b/samples/subsys/usb/mass/prj.conf
@@ -14,12 +14,3 @@ CONFIG_USB_MASS_STORAGE_LOG_LEVEL_ERR=y
 # If the target's code needs to do file operations, enable target's
 # FAT FS code. (Without this only the host can access the fs contents)
 #CONFIG_FILE_SYSTEM=y
-
-#SPI flash related configs
-CONFIG_DISK_ACCESS_FLASH=y
-CONFIG_MASS_STORAGE_DISK_NAME="NAND"
-CONFIG_SPI=y
-
-#Want RAM DISK instead ? comment the whole flash block and uncomment
-#CONFIG_DISK_ACCESS_RAM=y
-#CONFIG_MASS_STORAGE_DISK_NAME="RAM"
diff --git a/samples/subsys/usb/mass/sample.yaml b/samples/subsys/usb/mass/sample.yaml
index 697239c9352..06bacc5610a 100644
--- a/samples/subsys/usb/mass/sample.yaml
+++ b/samples/subsys/usb/mass/sample.yaml
@@ -1,6 +1,25 @@
 sample:
   name: Mass Storage
 tests:
-  test:
+  test_mass_flash:
+    extra_args: OVERLAY_CONFIG="overlay-flash-disk.conf"
+    extra_configs:
+        - CONFIG_LOG_DEFAULT_LEVEL=3
     platform_whitelist: arduino_101
     tags: msd usb
+    harness: console
+    harness_config:
+      type: one_line
+      regex:
+        - "The device is put in USB mass storage mode."
+  test_mass_ram:
+    extra_args: OVERLAY_CONFIG="overlay-ram-disk.conf"
+    extra_configs:
+        - CONFIG_LOG_DEFAULT_LEVEL=3
+    platform_whitelist: frdm_k64f quark_se_c1000_devboard
+    tags: msd usb
+    harness: console
+    harness_config:
+      type: one_line
+      regex:
+        - "The device is put in USB mass storage mode."