summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2016-02-12 10:37:06 +0200
committerJohan Hedberg <johan.hedberg@intel.com>2016-02-12 10:46:32 +0200
commit1589a22650cae46a333dac3cc62aaa14a62bc572 (patch)
treea9540210d09e4d62c0d5351087ec6a79626bf231
parent8dad8eeffa43adf2b71db05159a842bb02fb0c78 (diff)
Bluetooth: samples: Move init and shell to tests
The init, init_h5 and shell are not really samples but fit better in the test category. Change-Id: Id1a7ff31ad8767f858705bd952311cf64ff1f3f2 Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
-rw-r--r--tests/bluetooth/init/Makefile (renamed from samples/bluetooth/init/Makefile)0
-rw-r--r--tests/bluetooth/init/prj.conf (renamed from samples/bluetooth/init/prj.conf)0
-rw-r--r--tests/bluetooth/init/prj.mdef (renamed from samples/bluetooth/init/prj.mdef)0
-rw-r--r--tests/bluetooth/init/src/Makefile (renamed from samples/bluetooth/init/src/Makefile)0
-rw-r--r--tests/bluetooth/init/src/main.c (renamed from samples/bluetooth/init/src/main.c)0
-rw-r--r--tests/bluetooth/init/testcase.ini (renamed from samples/bluetooth/init/testcase.ini)0
-rw-r--r--tests/bluetooth/init_h5/Makefile (renamed from samples/bluetooth/init_h5/Makefile)0
-rw-r--r--tests/bluetooth/init_h5/prj.conf (renamed from samples/bluetooth/init_h5/prj.conf)0
-rw-r--r--tests/bluetooth/init_h5/prj.mdef (renamed from samples/bluetooth/init_h5/prj.mdef)0
-rw-r--r--tests/bluetooth/init_h5/src/Makefile (renamed from samples/bluetooth/init_h5/src/Makefile)0
-rw-r--r--tests/bluetooth/init_h5/src/main.c (renamed from samples/bluetooth/init_h5/src/main.c)0
-rw-r--r--tests/bluetooth/init_h5/testcase.ini (renamed from samples/bluetooth/init_h5/testcase.ini)0
-rw-r--r--tests/bluetooth/shell/Makefile (renamed from samples/bluetooth/shell/Makefile)0
-rw-r--r--tests/bluetooth/shell/README (renamed from samples/bluetooth/shell/README)0
-rw-r--r--tests/bluetooth/shell/prj.mdef (renamed from samples/bluetooth/shell/prj.mdef)0
-rw-r--r--tests/bluetooth/shell/prj_arm.conf (renamed from samples/bluetooth/shell/prj_arm.conf)0
-rw-r--r--tests/bluetooth/shell/prj_nble.conf (renamed from samples/bluetooth/shell/prj_nble.conf)0
-rw-r--r--tests/bluetooth/shell/prj_x86.conf (renamed from samples/bluetooth/shell/prj_x86.conf)0
-rw-r--r--tests/bluetooth/shell/src/Makefile (renamed from samples/bluetooth/shell/src/Makefile)0
-rw-r--r--tests/bluetooth/shell/src/main.c (renamed from samples/bluetooth/shell/src/main.c)4
-rw-r--r--tests/bluetooth/shell/testcase.ini (renamed from samples/bluetooth/shell/testcase.ini)0
21 files changed, 2 insertions, 2 deletions
diff --git a/samples/bluetooth/init/Makefile b/tests/bluetooth/init/Makefile
index 01f9c3088..01f9c3088 100644
--- a/samples/bluetooth/init/Makefile
+++ b/tests/bluetooth/init/Makefile
diff --git a/samples/bluetooth/init/prj.conf b/tests/bluetooth/init/prj.conf
index 2016bddd5..2016bddd5 100644
--- a/samples/bluetooth/init/prj.conf
+++ b/tests/bluetooth/init/prj.conf
diff --git a/samples/bluetooth/init/prj.mdef b/tests/bluetooth/init/prj.mdef
index 0a301e3b9..0a301e3b9 100644
--- a/samples/bluetooth/init/prj.mdef
+++ b/tests/bluetooth/init/prj.mdef
diff --git a/samples/bluetooth/init/src/Makefile b/tests/bluetooth/init/src/Makefile
index 00066e156..00066e156 100644
--- a/samples/bluetooth/init/src/Makefile
+++ b/tests/bluetooth/init/src/Makefile
diff --git a/samples/bluetooth/init/src/main.c b/tests/bluetooth/init/src/main.c
index 3f4e8c615..3f4e8c615 100644
--- a/samples/bluetooth/init/src/main.c
+++ b/tests/bluetooth/init/src/main.c
diff --git a/samples/bluetooth/init/testcase.ini b/tests/bluetooth/init/testcase.ini
index 2d14db30c..2d14db30c 100644
--- a/samples/bluetooth/init/testcase.ini
+++ b/tests/bluetooth/init/testcase.ini
diff --git a/samples/bluetooth/init_h5/Makefile b/tests/bluetooth/init_h5/Makefile
index 01f9c3088..01f9c3088 100644
--- a/samples/bluetooth/init_h5/Makefile
+++ b/tests/bluetooth/init_h5/Makefile
diff --git a/samples/bluetooth/init_h5/prj.conf b/tests/bluetooth/init_h5/prj.conf
index e96ed8efc..e96ed8efc 100644
--- a/samples/bluetooth/init_h5/prj.conf
+++ b/tests/bluetooth/init_h5/prj.conf
diff --git a/samples/bluetooth/init_h5/prj.mdef b/tests/bluetooth/init_h5/prj.mdef
index 0a301e3b9..0a301e3b9 100644
--- a/samples/bluetooth/init_h5/prj.mdef
+++ b/tests/bluetooth/init_h5/prj.mdef
diff --git a/samples/bluetooth/init_h5/src/Makefile b/tests/bluetooth/init_h5/src/Makefile
index 00066e156..00066e156 100644
--- a/samples/bluetooth/init_h5/src/Makefile
+++ b/tests/bluetooth/init_h5/src/Makefile
diff --git a/samples/bluetooth/init_h5/src/main.c b/tests/bluetooth/init_h5/src/main.c
index 3f4e8c615..3f4e8c615 100644
--- a/samples/bluetooth/init_h5/src/main.c
+++ b/tests/bluetooth/init_h5/src/main.c
diff --git a/samples/bluetooth/init_h5/testcase.ini b/tests/bluetooth/init_h5/testcase.ini
index 88db3c61e..88db3c61e 100644
--- a/samples/bluetooth/init_h5/testcase.ini
+++ b/tests/bluetooth/init_h5/testcase.ini
diff --git a/samples/bluetooth/shell/Makefile b/tests/bluetooth/shell/Makefile
index 550df8d1f..550df8d1f 100644
--- a/samples/bluetooth/shell/Makefile
+++ b/tests/bluetooth/shell/Makefile
diff --git a/samples/bluetooth/shell/README b/tests/bluetooth/shell/README
index 4245218d3..4245218d3 100644
--- a/samples/bluetooth/shell/README
+++ b/tests/bluetooth/shell/README
diff --git a/samples/bluetooth/shell/prj.mdef b/tests/bluetooth/shell/prj.mdef
index bce99aa8b..bce99aa8b 100644
--- a/samples/bluetooth/shell/prj.mdef
+++ b/tests/bluetooth/shell/prj.mdef
diff --git a/samples/bluetooth/shell/prj_arm.conf b/tests/bluetooth/shell/prj_arm.conf
index 3fa287762..3fa287762 100644
--- a/samples/bluetooth/shell/prj_arm.conf
+++ b/tests/bluetooth/shell/prj_arm.conf
diff --git a/samples/bluetooth/shell/prj_nble.conf b/tests/bluetooth/shell/prj_nble.conf
index 2e92a9791..2e92a9791 100644
--- a/samples/bluetooth/shell/prj_nble.conf
+++ b/tests/bluetooth/shell/prj_nble.conf
diff --git a/samples/bluetooth/shell/prj_x86.conf b/tests/bluetooth/shell/prj_x86.conf
index 7b2f88023..7b2f88023 100644
--- a/samples/bluetooth/shell/prj_x86.conf
+++ b/tests/bluetooth/shell/prj_x86.conf
diff --git a/samples/bluetooth/shell/src/Makefile b/tests/bluetooth/shell/src/Makefile
index aaba2d2c2..aaba2d2c2 100644
--- a/samples/bluetooth/shell/src/Makefile
+++ b/tests/bluetooth/shell/src/Makefile
diff --git a/samples/bluetooth/shell/src/main.c b/tests/bluetooth/shell/src/main.c
index 92145ac35..e8f41bd6f 100644
--- a/samples/bluetooth/shell/src/main.c
+++ b/tests/bluetooth/shell/src/main.c
@@ -44,7 +44,7 @@
#define CREDITS 10
#define DATA_MTU (23 * CREDITS)
-static struct bt_conn *default_conn = NULL;
+static struct bt_conn *default_conn;
/* Connection context for BR/EDR legacy pairing in sec mode 3 */
static struct bt_conn *pairing_conn;
@@ -488,7 +488,7 @@ static void cmd_scan(int argc, char *argv[])
return;
}
- action = (char*)argv[1];
+ action = argv[1];
if (!strcmp(action, "on")) {
cmd_active_scan_on();
} else if (!strcmp(action, "off")) {
diff --git a/samples/bluetooth/shell/testcase.ini b/tests/bluetooth/shell/testcase.ini
index 53b82525e..53b82525e 100644
--- a/samples/bluetooth/shell/testcase.ini
+++ b/tests/bluetooth/shell/testcase.ini