dev_start/stop_test: Remove vendor name default
Instead of defaulting a specific vendor name, require the vendor name to
be provided from the command line (-N) to enable log files collection
and upload capability.
Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
diff --git a/dev.c b/dev.c
index 356b841..99f1388 100644
--- a/dev.c
+++ b/dev.c
@@ -359,10 +359,11 @@
static int build_log_dir(struct sigma_dut *dut, char *dir, size_t dir_size)
{
int res;
- const char *vendor;
+ const char *vendor = dut->vendor_name;
int i;
- vendor = dut->vendor_name ? dut->vendor_name : "Qualcomm";
+ if (!vendor)
+ return -1;
if (dut->log_file_dir) {
res = snprintf(dir, dir_size, "%s/%s", dut->log_file_dir,
@@ -415,6 +416,12 @@
if (!(val && is_runtime_id_valid(dut, val)))
return INVALID_SEND_STATUS;
+ if (!dut->vendor_name) {
+ sigma_dut_print(dut, DUT_MSG_INFO,
+ "Log collection not supported without vendor name specified on the command line (-N)");
+ return SUCCESS_SEND_STATUS;
+ }
+
if (build_log_dir(dut, dir, sizeof(dir)) < 0)
return ERROR_SEND_STATUS;
@@ -608,6 +615,12 @@
char dir[200];
int res;
+ if (!dut->vendor_name) {
+ sigma_dut_print(dut, DUT_MSG_INFO,
+ "Log collection not supported without vendor name specified on the command line (-N)");
+ return SUCCESS_SEND_STATUS;
+ }
+
val = get_param(cmd, "Runtime_ID");
if (!val || strcmp(val, dut->dev_start_test_runtime_id) != 0) {
sigma_dut_print(dut, DUT_MSG_ERROR, "Invalid runtime id");
@@ -631,7 +644,7 @@
#endif /* ANDROID */
res = snprintf(out_file, sizeof(out_file), "%s_%s_%s.tar.gz",
- dut->vendor_name ? dut->vendor_name : "Qualcomm",
+ dut->vendor_name,
dut->model_name ? dut->model_name : "Unknown",
dut->dev_start_test_runtime_id);
if (res < 0 || res >= sizeof(out_file))