From f02fa01e9a9af1a1637a387f3e8044a791b47ced Mon Sep 17 00:00:00 2001
From: Cody McGinnis <brainwart@gmail.com>
Date: Fri, 28 Aug 2020 16:21:31 -0400
Subject: fix(test): change the layout

---
 app/boards/native_posix.conf                       |  3 +-
 app/boards/native_posix.overlay                    | 73 ++--------------------
 app/dts/bindings/zmk,kscan-mock.yaml               |  2 +
 app/include/dt-bindings/zmk/kscan-mock.h           |  8 +++
 app/include/zmk/kscan-mock.h                       |  8 ---
 app/prj.conf                                       |  0
 app/run-test.sh                                    | 17 +++++
 app/src/kscan_mock.c                               | 12 +++-
 app/tests/keypress/behavior_keymap.dtsi            | 28 +++++++++
 .../keypress/cp-press-release/events.patterns      |  1 +
 .../cp-press-release/keycode_events.snapshot       |  2 +
 .../keypress/cp-press-release/native_posix.keymap  |  5 ++
 .../keypress/kp-press-release/events.patterns      |  1 +
 .../kp-press-release/keycode_events.snapshot       |  2 +
 .../keypress/kp-press-release/native_posix.keymap  |  8 +++
 15 files changed, 90 insertions(+), 80 deletions(-)
 create mode 100644 app/include/dt-bindings/zmk/kscan-mock.h
 delete mode 100644 app/include/zmk/kscan-mock.h
 create mode 100644 app/prj.conf
 create mode 100755 app/run-test.sh
 create mode 100644 app/tests/keypress/behavior_keymap.dtsi
 create mode 100644 app/tests/keypress/cp-press-release/events.patterns
 create mode 100644 app/tests/keypress/cp-press-release/keycode_events.snapshot
 create mode 100644 app/tests/keypress/cp-press-release/native_posix.keymap
 create mode 100644 app/tests/keypress/kp-press-release/events.patterns
 create mode 100644 app/tests/keypress/kp-press-release/keycode_events.snapshot
 create mode 100644 app/tests/keypress/kp-press-release/native_posix.keymap

(limited to 'app')

diff --git a/app/boards/native_posix.conf b/app/boards/native_posix.conf
index 5bfb366..357b1b8 100644
--- a/app/boards/native_posix.conf
+++ b/app/boards/native_posix.conf
@@ -1,9 +1,8 @@
 CONFIG_KSCAN=n
 CONFIG_ZMK_KSCAN_MOCK_DRIVER=y
-CONFIG_ZMK_KSCAN_COMPOSITE_DRIVER=y
 CONFIG_ZMK_KSCAN_GPIO_DRIVER=n
 CONFIG_GPIO=n
 CONFIG_ZMK_BLE=n
 CONFIG_LOG=y
-CONFIG_KSCAN_LOG_LEVEL_DBG=y
+CONFIG_LOG_BACKEND_SHOW_COLOR=n
 CONFIG_ZMK_LOG_LEVEL_DBG=y
diff --git a/app/boards/native_posix.overlay b/app/boards/native_posix.overlay
index e9c4c95..bbb23b6 100644
--- a/app/boards/native_posix.overlay
+++ b/app/boards/native_posix.overlay
@@ -1,79 +1,18 @@
-#include <dt-bindings/zmk/keys.h>
 #include <behaviors.dtsi>
-#include <zmk/kscan-mock.h>
+#include <dt-bindings/zmk/keys.h>
+#include <dt-bindings/zmk/kscan-mock.h>
 
 / {
 	chosen {
-		zmk,kscan = &kscan0;
-		zmk,keymap = &keymap0;
-	};
-
-	kscan0: kscan_0 {
-		compatible = "zmk,kscan-composite";
-		label = "KSCAN_COMP";
-		rows = <2>;
-		columns = <4>;
-
-		left: left {
-			kscan = <&left_hand>;
-		};
-
-		right: right {
-			kscan = <&right_hand>;
-			column-offset = <2>;
-		};
+		zmk,kscan = &kscan;
 	};
 
-	left_hand: kscan_1 {
+	kscan: kscan {
 		compatible = "zmk,kscan-mock";
-		label = "KSCAN_LEFT";
+		label = "KSCAN_MOCK";
 
 		rows = <2>;
 		columns = <2>;
-		events = <ZMK_MOCK_PRESS(0,1,300) ZMK_MOCK_PRESS(0,0,300) ZMK_MOCK_RELEASE(0,0,300) ZMK_MOCK_RELEASE(0,1,300)>;
-		// events = <ZMK_MOCK_PRESS(0,0,800) ZMK_MOCK_RELEASE(0,0,800) ZMK_MOCK_PRESS(0,1,800) ZMK_MOCK_RELEASE(0,1,800)>;
-	};
-
-	right_hand: kscan_2 {
-		compatible = "zmk,kscan-mock";
-		label = "KSCAN_RIGHT";
-
-		rows = <2>;
-		columns = <2>;
-		events = <ZMK_MOCK_PRESS(1,1,800) ZMK_MOCK_RELEASE(1,1,100) ZMK_MOCK_PRESS(0,1,800) ZMK_MOCK_RELEASE(0,1,100)>;
-	};
-
-	keymap0: keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
-		layers = <&default &lower &raise>;
-	};
-
-	layers {
-		compatible = "zmk,layers";
-
-		default: layer_0 {
-			label = "DEFAULT";
-
-			bindings = <
-				&kp B &mo 1 &kp C &kp E
-				&kp D &kp G &kp F &kp Q>;
-		};
-
-		lower: layer_1 {
-			label = "LOWER";
-
-			bindings = <
-				&cp M_NEXT &trans &kp O &kp Q
-				&kp L  &kp J &kp P &kp K>;
-		};
-
-		raise: layer_2 {
-			label = "RAISE";
-
-			bindings = <
-				&kp W &kp U &kp I &kp N
-				&kp X  &kp M &kp C &kp B>;
-		};
+		exit-after;
 	};
 };
diff --git a/app/dts/bindings/zmk,kscan-mock.yaml b/app/dts/bindings/zmk,kscan-mock.yaml
index 41dd5b8..f9d83fa 100644
--- a/app/dts/bindings/zmk,kscan-mock.yaml
+++ b/app/dts/bindings/zmk,kscan-mock.yaml
@@ -15,3 +15,5 @@ properties:
     type: int
   columns:
     type: int
+  exit-after:
+    type: boolean
diff --git a/app/include/dt-bindings/zmk/kscan-mock.h b/app/include/dt-bindings/zmk/kscan-mock.h
new file mode 100644
index 0000000..d481899
--- /dev/null
+++ b/app/include/dt-bindings/zmk/kscan-mock.h
@@ -0,0 +1,8 @@
+#pragma once
+
+#define ZMK_MOCK_IS_PRESS(v) ((v & (0x01 << 31)) != 0)
+#define ZMK_MOCK_PRESS(row, col, msec) (row + (col << 8) + (msec << 16) + (0x01 << 31))
+#define ZMK_MOCK_RELEASE(row, col, msec) (row + (col << 8) + (msec << 16))
+#define ZMK_MOCK_ROW(v) (v & 0xFF)
+#define ZMK_MOCK_COL(v) ((v >> 8) & 0xFF)
+#define ZMK_MOCK_MSEC(v) ((v & ~(0x01 << 31)) >> 16)
diff --git a/app/include/zmk/kscan-mock.h b/app/include/zmk/kscan-mock.h
deleted file mode 100644
index d481899..0000000
--- a/app/include/zmk/kscan-mock.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma once
-
-#define ZMK_MOCK_IS_PRESS(v) ((v & (0x01 << 31)) != 0)
-#define ZMK_MOCK_PRESS(row, col, msec) (row + (col << 8) + (msec << 16) + (0x01 << 31))
-#define ZMK_MOCK_RELEASE(row, col, msec) (row + (col << 8) + (msec << 16))
-#define ZMK_MOCK_ROW(v) (v & 0xFF)
-#define ZMK_MOCK_COL(v) ((v >> 8) & 0xFF)
-#define ZMK_MOCK_MSEC(v) ((v & ~(0x01 << 31)) >> 16)
diff --git a/app/prj.conf b/app/prj.conf
new file mode 100644
index 0000000..e69de29
diff --git a/app/run-test.sh b/app/run-test.sh
new file mode 100755
index 0000000..4ed12a2
--- /dev/null
+++ b/app/run-test.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+if [ -z "$1" ]; then
+	echo "Usage: ./run-test.sh <path to testcase>"
+	exit 1
+elif [ "$1" = "all" ]; then
+	find tests -name native_posix.keymap -exec dirname \{\} \; | xargs -l -P 2 ./run-test.sh
+	exit $?
+fi
+
+testcase="$1"
+echo "Running $testcase:"
+
+west build --pristine -d build/$testcase -b native_posix -- -DZMK_CONFIG=$testcase > /dev/null
+./build/$testcase/zephyr/zmk.exe | sed -e "s/.*> //" | sed -n -f $testcase/events.patterns > build/$testcase/keycode_events.log
+
+diff -au $testcase/keycode_events.snapshot build/$testcase/keycode_events.log
diff --git a/app/src/kscan_mock.c b/app/src/kscan_mock.c
index b0ba90b..1bd8a74 100644
--- a/app/src/kscan_mock.c
+++ b/app/src/kscan_mock.c
@@ -6,13 +6,14 @@
 
 #define DT_DRV_COMPAT zmk_kscan_mock
 
+#include <stdlib.h>
 #include <device.h>
 #include <drivers/kscan.h>
 #include <logging/log.h>
 
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
-#include <zmk/kscan-mock.h>
+#include <dt-bindings/zmk/kscan-mock.h>
 
 struct kscan_mock_data
 {
@@ -50,6 +51,7 @@ static int kscan_mock_configure(struct device *dev, kscan_callback_t callback)
     struct kscan_mock_config_##n                                                   \
     {                                                                              \
         u32_t events[DT_INST_PROP_LEN(n, events)];                                 \
+        bool exit_after;                                                           \
     };                                                                             \
     static void kscan_mock_schedule_next_event_##n(struct device *dev)             \
     {                                                                              \
@@ -60,6 +62,9 @@ static int kscan_mock_configure(struct device *dev, kscan_callback_t callback)
             u32_t ev = cfg->events[data->event_index];                             \
             LOG_DBG("delaying next keypress: %d", ZMK_MOCK_MSEC(ev));              \
             k_delayed_work_submit(&data->work, K_MSEC(ZMK_MOCK_MSEC(ev)));         \
+        } else if (cfg->exit_after) {                                              \
+            LOG_DBG("Exiting");                                                    \
+            exit(0);                                                               \
         }                                                                          \
     }                                                                              \
     static void kscan_mock_work_handler_##n(struct k_work *work)                   \
@@ -93,11 +98,12 @@ static int kscan_mock_configure(struct device *dev, kscan_callback_t callback)
     };                                                                             \
     static struct kscan_mock_data kscan_mock_data_##n;                             \
     static const struct kscan_mock_config_##n kscan_mock_config_##n = {            \
-        .events = DT_INST_PROP(n, events)};                                        \
+        .events = DT_INST_PROP(n, events),                                         \
+        .exit_after = DT_INST_PROP(n, exit_after) };                               \
     DEVICE_AND_API_INIT(kscan_mock_##n, DT_INST_LABEL(n), kscan_mock_init_##n,     \
                         &kscan_mock_data_##n,                                      \
                         &kscan_mock_config_##n,                                    \
                         APPLICATION, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT,          \
                         &mock_driver_api_##n);
 
-DT_INST_FOREACH_STATUS_OKAY(MOCK_INST_INIT)
\ No newline at end of file
+DT_INST_FOREACH_STATUS_OKAY(MOCK_INST_INIT)
diff --git a/app/tests/keypress/behavior_keymap.dtsi b/app/tests/keypress/behavior_keymap.dtsi
new file mode 100644
index 0000000..34c445c
--- /dev/null
+++ b/app/tests/keypress/behavior_keymap.dtsi
@@ -0,0 +1,28 @@
+#include <dt-bindings/zmk/keys.h>
+#include <behaviors.dtsi>
+#include <dt-bindings/zmk/kscan-mock.h>
+
+/ {
+	keymap {
+		compatible = "zmk,keymap";
+		label ="Default keymap";
+
+		default_layer {
+			bindings = <
+				&kp B &mo 1
+				&kp D &kp G>;
+		};
+
+		lower_layer {
+			bindings = <
+				&cp M_NEXT &trans
+				&kp L  &kp J>;
+		};
+
+		raise_layer {
+			bindings = <
+				&kp W &kp U
+				&kp X  &kp M>;
+		};
+	};
+};
diff --git a/app/tests/keypress/cp-press-release/events.patterns b/app/tests/keypress/cp-press-release/events.patterns
new file mode 100644
index 0000000..833100f
--- /dev/null
+++ b/app/tests/keypress/cp-press-release/events.patterns
@@ -0,0 +1 @@
+s/.*hid_listener_keycode_//p
\ No newline at end of file
diff --git a/app/tests/keypress/cp-press-release/keycode_events.snapshot b/app/tests/keypress/cp-press-release/keycode_events.snapshot
new file mode 100644
index 0000000..f1ef0ed
--- /dev/null
+++ b/app/tests/keypress/cp-press-release/keycode_events.snapshot
@@ -0,0 +1,2 @@
+pressed: usage_page 0x0c keycode 0xb5
+released: usage_page 0x0c keycode 0xb5
diff --git a/app/tests/keypress/cp-press-release/native_posix.keymap b/app/tests/keypress/cp-press-release/native_posix.keymap
new file mode 100644
index 0000000..7f9ae8a
--- /dev/null
+++ b/app/tests/keypress/cp-press-release/native_posix.keymap
@@ -0,0 +1,5 @@
+#include "../behavior_keymap.dtsi"
+
+&kscan {
+	events = <ZMK_MOCK_PRESS(0,1,300) ZMK_MOCK_PRESS(0,0,300) ZMK_MOCK_RELEASE(0,0,300) ZMK_MOCK_RELEASE(0,1,300)>;
+};
\ No newline at end of file
diff --git a/app/tests/keypress/kp-press-release/events.patterns b/app/tests/keypress/kp-press-release/events.patterns
new file mode 100644
index 0000000..833100f
--- /dev/null
+++ b/app/tests/keypress/kp-press-release/events.patterns
@@ -0,0 +1 @@
+s/.*hid_listener_keycode_//p
\ No newline at end of file
diff --git a/app/tests/keypress/kp-press-release/keycode_events.snapshot b/app/tests/keypress/kp-press-release/keycode_events.snapshot
new file mode 100644
index 0000000..f1ef0ed
--- /dev/null
+++ b/app/tests/keypress/kp-press-release/keycode_events.snapshot
@@ -0,0 +1,2 @@
+pressed: usage_page 0x0c keycode 0xb5
+released: usage_page 0x0c keycode 0xb5
diff --git a/app/tests/keypress/kp-press-release/native_posix.keymap b/app/tests/keypress/kp-press-release/native_posix.keymap
new file mode 100644
index 0000000..235348e
--- /dev/null
+++ b/app/tests/keypress/kp-press-release/native_posix.keymap
@@ -0,0 +1,8 @@
+#include <dt-bindings/zmk/keys.h>
+#include <behaviors.dtsi>
+#include <dt-bindings/zmk/kscan-mock.h>
+#include "../behavior_keymap.dtsi"
+
+&kscan {
+	events = <ZMK_MOCK_PRESS(0,1,300) ZMK_MOCK_PRESS(0,0,300) ZMK_MOCK_RELEASE(0,0,300) ZMK_MOCK_RELEASE(0,1,300)>;
+};
\ No newline at end of file
-- 
cgit v1.2.3


From 5b21f15a0a3e2d27d57b7a657d031a66d1124701 Mon Sep 17 00:00:00 2001
From: Cody McGinnis <brainwart@gmail.com>
Date: Fri, 28 Aug 2020 16:21:31 -0400
Subject: fix(test): off by one error with kscan processing

---
 app/src/kscan_mock.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/src/kscan_mock.c b/app/src/kscan_mock.c
index 1bd8a74..d626c71 100644
--- a/app/src/kscan_mock.c
+++ b/app/src/kscan_mock.c
@@ -72,12 +72,13 @@ static int kscan_mock_configure(struct device *dev, kscan_callback_t callback)
         struct kscan_mock_data *data =                                             \
             CONTAINER_OF(work, struct kscan_mock_data, work);                      \
         const struct kscan_mock_config_##n *cfg = data->dev->config_info;          \
-        u32_t ev = cfg->events[data->event_index++];                               \
+        u32_t ev = cfg->events[data->event_index];                                 \
         LOG_DBG("ev %u row %d column %d state %d\n", ev,                           \
                 ZMK_MOCK_ROW(ev), ZMK_MOCK_COL(ev), ZMK_MOCK_IS_PRESS(ev));        \
         data->callback(data->dev,                                                  \
                        ZMK_MOCK_ROW(ev), ZMK_MOCK_COL(ev), ZMK_MOCK_IS_PRESS(ev)); \
         kscan_mock_schedule_next_event_##n(data->dev);                             \
+        data->event_index++;                                                       \
     }                                                                              \
     static int kscan_mock_init_##n(struct device *dev)                             \
     {                                                                              \
-- 
cgit v1.2.3


From 5f56266a6953dd1ebeb95ded4213e74f9572ae4d Mon Sep 17 00:00:00 2001
From: Cody McGinnis <brainwart@gmail.com>
Date: Fri, 28 Aug 2020 16:21:31 -0400
Subject: feat(test): add tests for momentary layers

---
 app/tests/momentary-layer/behavior_keymap.dtsi     | 28 ++++++++++++++++++++++
 .../early-key-release/events.patterns              |  2 ++
 .../early-key-release/keycode_events.snapshot      |  4 ++++
 .../early-key-release/native_posix.keymap          |  8 +++++++
 app/tests/momentary-layer/normal/events.patterns   |  2 ++
 .../momentary-layer/normal/keycode_events.snapshot |  4 ++++
 .../momentary-layer/normal/native_posix.keymap     |  8 +++++++
 7 files changed, 56 insertions(+)
 create mode 100644 app/tests/momentary-layer/behavior_keymap.dtsi
 create mode 100644 app/tests/momentary-layer/early-key-release/events.patterns
 create mode 100644 app/tests/momentary-layer/early-key-release/keycode_events.snapshot
 create mode 100644 app/tests/momentary-layer/early-key-release/native_posix.keymap
 create mode 100644 app/tests/momentary-layer/normal/events.patterns
 create mode 100644 app/tests/momentary-layer/normal/keycode_events.snapshot
 create mode 100644 app/tests/momentary-layer/normal/native_posix.keymap

(limited to 'app')

diff --git a/app/tests/momentary-layer/behavior_keymap.dtsi b/app/tests/momentary-layer/behavior_keymap.dtsi
new file mode 100644
index 0000000..34c445c
--- /dev/null
+++ b/app/tests/momentary-layer/behavior_keymap.dtsi
@@ -0,0 +1,28 @@
+#include <dt-bindings/zmk/keys.h>
+#include <behaviors.dtsi>
+#include <dt-bindings/zmk/kscan-mock.h>
+
+/ {
+	keymap {
+		compatible = "zmk,keymap";
+		label ="Default keymap";
+
+		default_layer {
+			bindings = <
+				&kp B &mo 1
+				&kp D &kp G>;
+		};
+
+		lower_layer {
+			bindings = <
+				&cp M_NEXT &trans
+				&kp L  &kp J>;
+		};
+
+		raise_layer {
+			bindings = <
+				&kp W &kp U
+				&kp X  &kp M>;
+		};
+	};
+};
diff --git a/app/tests/momentary-layer/early-key-release/events.patterns b/app/tests/momentary-layer/early-key-release/events.patterns
new file mode 100644
index 0000000..bd7b488
--- /dev/null
+++ b/app/tests/momentary-layer/early-key-release/events.patterns
@@ -0,0 +1,2 @@
+s/.*hid_listener_keycode/kp/p
+s/.*mo_keymap_binding/mo/p
\ No newline at end of file
diff --git a/app/tests/momentary-layer/early-key-release/keycode_events.snapshot b/app/tests/momentary-layer/early-key-release/keycode_events.snapshot
new file mode 100644
index 0000000..474eef7
--- /dev/null
+++ b/app/tests/momentary-layer/early-key-release/keycode_events.snapshot
@@ -0,0 +1,4 @@
+kp_pressed: usage_page 0x07 keycode 0x05
+mo_pressed: position 1 layer 1
+kp_released: usage_page 0x07 keycode 0x05
+mo_released: position 1 layer 1
diff --git a/app/tests/momentary-layer/early-key-release/native_posix.keymap b/app/tests/momentary-layer/early-key-release/native_posix.keymap
new file mode 100644
index 0000000..a58ad26
--- /dev/null
+++ b/app/tests/momentary-layer/early-key-release/native_posix.keymap
@@ -0,0 +1,8 @@
+#include <dt-bindings/zmk/keys.h>
+#include <behaviors.dtsi>
+#include <dt-bindings/zmk/kscan-mock.h>
+#include "../behavior_keymap.dtsi"
+
+&kscan {
+	events = <ZMK_MOCK_PRESS(0,0,0) ZMK_MOCK_PRESS(0,1,100) ZMK_MOCK_RELEASE(0,0,200) ZMK_MOCK_RELEASE(0,1,300)>;
+};
\ No newline at end of file
diff --git a/app/tests/momentary-layer/normal/events.patterns b/app/tests/momentary-layer/normal/events.patterns
new file mode 100644
index 0000000..bd7b488
--- /dev/null
+++ b/app/tests/momentary-layer/normal/events.patterns
@@ -0,0 +1,2 @@
+s/.*hid_listener_keycode/kp/p
+s/.*mo_keymap_binding/mo/p
\ No newline at end of file
diff --git a/app/tests/momentary-layer/normal/keycode_events.snapshot b/app/tests/momentary-layer/normal/keycode_events.snapshot
new file mode 100644
index 0000000..f3fca66
--- /dev/null
+++ b/app/tests/momentary-layer/normal/keycode_events.snapshot
@@ -0,0 +1,4 @@
+mo_pressed: position 1 layer 1
+kp_pressed: usage_page 0x0c keycode 0xb5
+kp_released: usage_page 0x0c keycode 0xb5
+mo_released: position 1 layer 1
\ No newline at end of file
diff --git a/app/tests/momentary-layer/normal/native_posix.keymap b/app/tests/momentary-layer/normal/native_posix.keymap
new file mode 100644
index 0000000..1b67858
--- /dev/null
+++ b/app/tests/momentary-layer/normal/native_posix.keymap
@@ -0,0 +1,8 @@
+#include <dt-bindings/zmk/keys.h>
+#include <behaviors.dtsi>
+#include <dt-bindings/zmk/kscan-mock.h>
+#include "../behavior_keymap.dtsi"
+
+&kscan {
+	events = <ZMK_MOCK_PRESS(0,1,0) ZMK_MOCK_PRESS(0,0,100) ZMK_MOCK_RELEASE(0,0,200) ZMK_MOCK_RELEASE(0,1,300)>;
+};
\ No newline at end of file
-- 
cgit v1.2.3


From f1224422c502cb86c9138c42e28eb645fe62272f Mon Sep 17 00:00:00 2001
From: Cody McGinnis <brainwart@gmail.com>
Date: Fri, 28 Aug 2020 16:21:31 -0400
Subject: fix(test): stop using pristine and use 4 threads

---
 app/run-test.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/run-test.sh b/app/run-test.sh
index 4ed12a2..722cb93 100755
--- a/app/run-test.sh
+++ b/app/run-test.sh
@@ -4,14 +4,14 @@ if [ -z "$1" ]; then
 	echo "Usage: ./run-test.sh <path to testcase>"
 	exit 1
 elif [ "$1" = "all" ]; then
-	find tests -name native_posix.keymap -exec dirname \{\} \; | xargs -l -P 2 ./run-test.sh
+	find tests -name native_posix.keymap -exec dirname \{\} \; | xargs -l -P 4 ./run-test.sh
 	exit $?
 fi
 
 testcase="$1"
 echo "Running $testcase:"
 
-west build --pristine -d build/$testcase -b native_posix -- -DZMK_CONFIG=$testcase > /dev/null
+west build -d build/$testcase -b native_posix -- -DZMK_CONFIG=$testcase > /dev/null
 ./build/$testcase/zephyr/zmk.exe | sed -e "s/.*> //" | sed -n -f $testcase/events.patterns > build/$testcase/keycode_events.log
 
 diff -au $testcase/keycode_events.snapshot build/$testcase/keycode_events.log
-- 
cgit v1.2.3


From de92bf2b2de4a895dd36cffb549772f48428a0db Mon Sep 17 00:00:00 2001
From: Cody McGinnis <brainwart@gmail.com>
Date: Fri, 28 Aug 2020 16:21:31 -0400
Subject: fix(test): use a smaller value for mock key intervals

---
 app/tests/keypress/cp-press-release/native_posix.keymap         | 2 +-
 app/tests/keypress/kp-press-release/native_posix.keymap         | 2 +-
 app/tests/momentary-layer/early-key-release/native_posix.keymap | 2 +-
 app/tests/momentary-layer/normal/native_posix.keymap            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'app')

diff --git a/app/tests/keypress/cp-press-release/native_posix.keymap b/app/tests/keypress/cp-press-release/native_posix.keymap
index 7f9ae8a..0e86f93 100644
--- a/app/tests/keypress/cp-press-release/native_posix.keymap
+++ b/app/tests/keypress/cp-press-release/native_posix.keymap
@@ -1,5 +1,5 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <ZMK_MOCK_PRESS(0,1,300) ZMK_MOCK_PRESS(0,0,300) ZMK_MOCK_RELEASE(0,0,300) ZMK_MOCK_RELEASE(0,1,300)>;
+	events = <ZMK_MOCK_PRESS(0,1,10) ZMK_MOCK_PRESS(0,0,10) ZMK_MOCK_RELEASE(0,0,10) ZMK_MOCK_RELEASE(0,1,10)>;
 };
\ No newline at end of file
diff --git a/app/tests/keypress/kp-press-release/native_posix.keymap b/app/tests/keypress/kp-press-release/native_posix.keymap
index 235348e..7f73690 100644
--- a/app/tests/keypress/kp-press-release/native_posix.keymap
+++ b/app/tests/keypress/kp-press-release/native_posix.keymap
@@ -4,5 +4,5 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <ZMK_MOCK_PRESS(0,1,300) ZMK_MOCK_PRESS(0,0,300) ZMK_MOCK_RELEASE(0,0,300) ZMK_MOCK_RELEASE(0,1,300)>;
+	events = <ZMK_MOCK_PRESS(0,1,10) ZMK_MOCK_PRESS(0,0,10) ZMK_MOCK_RELEASE(0,0,10) ZMK_MOCK_RELEASE(0,1,10)>;
 };
\ No newline at end of file
diff --git a/app/tests/momentary-layer/early-key-release/native_posix.keymap b/app/tests/momentary-layer/early-key-release/native_posix.keymap
index a58ad26..e7628c0 100644
--- a/app/tests/momentary-layer/early-key-release/native_posix.keymap
+++ b/app/tests/momentary-layer/early-key-release/native_posix.keymap
@@ -4,5 +4,5 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <ZMK_MOCK_PRESS(0,0,0) ZMK_MOCK_PRESS(0,1,100) ZMK_MOCK_RELEASE(0,0,200) ZMK_MOCK_RELEASE(0,1,300)>;
+	events = <ZMK_MOCK_PRESS(0,0,10) ZMK_MOCK_PRESS(0,1,10) ZMK_MOCK_RELEASE(0,0,10) ZMK_MOCK_RELEASE(0,1,10)>;
 };
\ No newline at end of file
diff --git a/app/tests/momentary-layer/normal/native_posix.keymap b/app/tests/momentary-layer/normal/native_posix.keymap
index 1b67858..7f73690 100644
--- a/app/tests/momentary-layer/normal/native_posix.keymap
+++ b/app/tests/momentary-layer/normal/native_posix.keymap
@@ -4,5 +4,5 @@
 #include "../behavior_keymap.dtsi"
 
 &kscan {
-	events = <ZMK_MOCK_PRESS(0,1,0) ZMK_MOCK_PRESS(0,0,100) ZMK_MOCK_RELEASE(0,0,200) ZMK_MOCK_RELEASE(0,1,300)>;
+	events = <ZMK_MOCK_PRESS(0,1,10) ZMK_MOCK_PRESS(0,0,10) ZMK_MOCK_RELEASE(0,0,10) ZMK_MOCK_RELEASE(0,1,10)>;
 };
\ No newline at end of file
-- 
cgit v1.2.3


From abf8b5abfae2c240e71db11f13183369a14333d7 Mon Sep 17 00:00:00 2001
From: Cody McGinnis <brainwart@gmail.com>
Date: Fri, 28 Aug 2020 16:21:31 -0400
Subject: fix(test): fix normal momentary-layer test snapshot

---
 app/tests/momentary-layer/normal/keycode_events.snapshot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/tests/momentary-layer/normal/keycode_events.snapshot b/app/tests/momentary-layer/normal/keycode_events.snapshot
index f3fca66..9dc6101 100644
--- a/app/tests/momentary-layer/normal/keycode_events.snapshot
+++ b/app/tests/momentary-layer/normal/keycode_events.snapshot
@@ -1,4 +1,4 @@
 mo_pressed: position 1 layer 1
 kp_pressed: usage_page 0x0c keycode 0xb5
 kp_released: usage_page 0x0c keycode 0xb5
-mo_released: position 1 layer 1
\ No newline at end of file
+mo_released: position 1 layer 1
-- 
cgit v1.2.3


From 3d325ccb84ecd3b25dd86d829c448dfd9b41a08f Mon Sep 17 00:00:00 2001
From: Cody McGinnis <brainwart@gmail.com>
Date: Fri, 28 Aug 2020 16:21:31 -0400
Subject: feat(test): add tests for none behavior

---
 app/tests/none/behavior_keymap.dtsi            | 22 ++++++++++++++++++++++
 app/tests/none/layered/events.patterns         |  1 +
 app/tests/none/layered/keycode_events.snapshot |  0
 app/tests/none/layered/native_posix.keymap     |  8 ++++++++
 app/tests/none/normal/events.patterns          |  1 +
 app/tests/none/normal/keycode_events.snapshot  |  0
 app/tests/none/normal/native_posix.keymap      |  8 ++++++++
 7 files changed, 40 insertions(+)
 create mode 100644 app/tests/none/behavior_keymap.dtsi
 create mode 100644 app/tests/none/layered/events.patterns
 create mode 100644 app/tests/none/layered/keycode_events.snapshot
 create mode 100644 app/tests/none/layered/native_posix.keymap
 create mode 100644 app/tests/none/normal/events.patterns
 create mode 100644 app/tests/none/normal/keycode_events.snapshot
 create mode 100644 app/tests/none/normal/native_posix.keymap

(limited to 'app')

diff --git a/app/tests/none/behavior_keymap.dtsi b/app/tests/none/behavior_keymap.dtsi
new file mode 100644
index 0000000..0a4f7cb
--- /dev/null
+++ b/app/tests/none/behavior_keymap.dtsi
@@ -0,0 +1,22 @@
+#include <dt-bindings/zmk/keys.h>
+#include <behaviors.dtsi>
+#include <dt-bindings/zmk/kscan-mock.h>
+
+/ {
+	keymap {
+		compatible = "zmk,keymap";
+		label ="Default keymap";
+
+		default_layer {
+			bindings = <
+				&none &mo 1
+				&kp A &none>;
+		};
+
+		lower_layer {
+			bindings = <
+				&none &trans
+				&none  &kp A>;
+		};
+	};
+};
diff --git a/app/tests/none/layered/events.patterns b/app/tests/none/layered/events.patterns
new file mode 100644
index 0000000..3c9d3f8
--- /dev/null
+++ b/app/tests/none/layered/events.patterns
@@ -0,0 +1 @@
+s/.*hid_listener_keycode/kp/p
\ No newline at end of file
diff --git a/app/tests/none/layered/keycode_events.snapshot b/app/tests/none/layered/keycode_events.snapshot
new file mode 100644
index 0000000..e69de29
diff --git a/app/tests/none/layered/native_posix.keymap b/app/tests/none/layered/native_posix.keymap
new file mode 100644
index 0000000..59ea481
--- /dev/null
+++ b/app/tests/none/layered/native_posix.keymap
@@ -0,0 +1,8 @@
+#include <dt-bindings/zmk/keys.h>
+#include <behaviors.dtsi>
+#include <dt-bindings/zmk/kscan-mock.h>
+#include "../behavior_keymap.dtsi"
+
+&kscan {
+	events = <ZMK_MOCK_PRESS(0,1,10) ZMK_MOCK_PRESS(1,0,10) ZMK_MOCK_RELEASE(1,0,10) ZMK_MOCK_RELEASE(0,1,10)>;
+};
\ No newline at end of file
diff --git a/app/tests/none/normal/events.patterns b/app/tests/none/normal/events.patterns
new file mode 100644
index 0000000..3c9d3f8
--- /dev/null
+++ b/app/tests/none/normal/events.patterns
@@ -0,0 +1 @@
+s/.*hid_listener_keycode/kp/p
\ No newline at end of file
diff --git a/app/tests/none/normal/keycode_events.snapshot b/app/tests/none/normal/keycode_events.snapshot
new file mode 100644
index 0000000..e69de29
diff --git a/app/tests/none/normal/native_posix.keymap b/app/tests/none/normal/native_posix.keymap
new file mode 100644
index 0000000..94d7539
--- /dev/null
+++ b/app/tests/none/normal/native_posix.keymap
@@ -0,0 +1,8 @@
+#include <dt-bindings/zmk/keys.h>
+#include <behaviors.dtsi>
+#include <dt-bindings/zmk/kscan-mock.h>
+#include "../behavior_keymap.dtsi"
+
+&kscan {
+	events = <ZMK_MOCK_PRESS(0,0,10) ZMK_MOCK_RELEASE(0,0,10)>;
+};
\ No newline at end of file
-- 
cgit v1.2.3


From 033bb7bfc4e1772ea19784bd71a57f49b4368e2d Mon Sep 17 00:00:00 2001
From: Cody McGinnis <brainwart@gmail.com>
Date: Fri, 28 Aug 2020 16:21:31 -0400
Subject: fix(behavior): add logging to toggle layer for tests

---
 app/src/behaviors/behavior_toggle_layer.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'app')

diff --git a/app/src/behaviors/behavior_toggle_layer.c b/app/src/behaviors/behavior_toggle_layer.c
index 13f4a29..02a76d2 100644
--- a/app/src/behaviors/behavior_toggle_layer.c
+++ b/app/src/behaviors/behavior_toggle_layer.c
@@ -14,28 +14,35 @@
 
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
-struct behavior_tog_config { };
-struct behavior_tog_data { };
+struct behavior_tog_config
+{
+};
+struct behavior_tog_data
+{
+};
 
 static int behavior_tog_init(struct device *dev)
 {
-	return 0;
+  return 0;
 };
 
-
 static int tog_keymap_binding_pressed(struct device *dev, u32_t position, u32_t layer, u32_t _)
 {
+  LOG_DBG("position %d layer %d", position, layer);
+
   return zmk_keymap_layer_toggle(layer);
 }
 
 static int tog_keymap_binding_released(struct device *dev, u32_t position, u32_t layer, u32_t _)
 {
+  LOG_DBG("position %d layer %d", position, layer);
+
   return 0;
 }
 
 static const struct behavior_driver_api behavior_tog_driver_api = {
-  .binding_pressed = tog_keymap_binding_pressed,
-  .binding_released = tog_keymap_binding_released,
+    .binding_pressed = tog_keymap_binding_pressed,
+    .binding_released = tog_keymap_binding_released,
 };
 
 static const struct behavior_tog_config behavior_tog_config = {};
-- 
cgit v1.2.3


From a722cbcea37e276a1778c6b0d0e3154fbe70334f Mon Sep 17 00:00:00 2001
From: Cody McGinnis <brainwart@gmail.com>
Date: Fri, 28 Aug 2020 16:21:31 -0400
Subject: feat(test): add tests for toggle layer

---
 app/tests/toggle-layer/behavior_keymap.dtsi        | 28 ++++++++++++++++++++++
 .../toggle-layer/early-key-release/events.patterns |  2 ++
 .../early-key-release/keycode_events.snapshot      |  6 +++++
 .../early-key-release/native_posix.keymap          |  9 +++++++
 app/tests/toggle-layer/normal/events.patterns      |  2 ++
 .../toggle-layer/normal/keycode_events.snapshot    |  4 ++++
 app/tests/toggle-layer/normal/native_posix.keymap  |  8 +++++++
 7 files changed, 59 insertions(+)
 create mode 100644 app/tests/toggle-layer/behavior_keymap.dtsi
 create mode 100644 app/tests/toggle-layer/early-key-release/events.patterns
 create mode 100644 app/tests/toggle-layer/early-key-release/keycode_events.snapshot
 create mode 100644 app/tests/toggle-layer/early-key-release/native_posix.keymap
 create mode 100644 app/tests/toggle-layer/normal/events.patterns
 create mode 100644 app/tests/toggle-layer/normal/keycode_events.snapshot
 create mode 100644 app/tests/toggle-layer/normal/native_posix.keymap

(limited to 'app')

diff --git a/app/tests/toggle-layer/behavior_keymap.dtsi b/app/tests/toggle-layer/behavior_keymap.dtsi
new file mode 100644
index 0000000..d2b41a9
--- /dev/null
+++ b/app/tests/toggle-layer/behavior_keymap.dtsi
@@ -0,0 +1,28 @@
+#include <dt-bindings/zmk/keys.h>
+#include <behaviors.dtsi>
+#include <dt-bindings/zmk/kscan-mock.h>
+
+/ {
+	keymap {
+		compatible = "zmk,keymap";
+		label ="Default keymap";
+
+		default_layer {
+			bindings = <
+				&kp B &tog 1
+				&kp D &kp G>;
+		};
+
+		lower_layer {
+			bindings = <
+				&cp M_NEXT &trans
+				&kp L  &kp J>;
+		};
+
+		raise_layer {
+			bindings = <
+				&kp W &kp U
+				&kp X  &kp M>;
+		};
+	};
+};
diff --git a/app/tests/toggle-layer/early-key-release/events.patterns b/app/tests/toggle-layer/early-key-release/events.patterns
new file mode 100644
index 0000000..397fef4
--- /dev/null
+++ b/app/tests/toggle-layer/early-key-release/events.patterns
@@ -0,0 +1,2 @@
+s/.*hid_listener_keycode/kp/p
+s/.*tog_keymap_binding/tog/p
\ No newline at end of file
diff --git a/app/tests/toggle-layer/early-key-release/keycode_events.snapshot b/app/tests/toggle-layer/early-key-release/keycode_events.snapshot
new file mode 100644
index 0000000..3ac017c
--- /dev/null
+++ b/app/tests/toggle-layer/early-key-release/keycode_events.snapshot
@@ -0,0 +1,6 @@
+kp_pressed: usage_page 0x07 keycode 0x05
+tog_pressed: position 1 layer 1
+kp_released: usage_page 0x07 keycode 0x05
+tog_released: position 1 layer 1
+kp_pressed: usage_page 0x0c keycode 0xb5
+kp_released: usage_page 0x0c keycode 0xb5
diff --git a/app/tests/toggle-layer/early-key-release/native_posix.keymap b/app/tests/toggle-layer/early-key-release/native_posix.keymap
new file mode 100644
index 0000000..6b2b8f2
--- /dev/null
+++ b/app/tests/toggle-layer/early-key-release/native_posix.keymap
@@ -0,0 +1,9 @@
+#include <dt-bindings/zmk/keys.h>
+#include <behaviors.dtsi>
+#include <dt-bindings/zmk/kscan-mock.h>
+#include "../behavior_keymap.dtsi"
+
+&kscan {
+	events = <ZMK_MOCK_PRESS(0,0,10) ZMK_MOCK_PRESS(0,1,10) ZMK_MOCK_RELEASE(0,0,10) ZMK_MOCK_RELEASE(0,1,10)
+		ZMK_MOCK_PRESS(0,0,10) ZMK_MOCK_RELEASE(0,0,10)>;
+};
\ No newline at end of file
diff --git a/app/tests/toggle-layer/normal/events.patterns b/app/tests/toggle-layer/normal/events.patterns
new file mode 100644
index 0000000..397fef4
--- /dev/null
+++ b/app/tests/toggle-layer/normal/events.patterns
@@ -0,0 +1,2 @@
+s/.*hid_listener_keycode/kp/p
+s/.*tog_keymap_binding/tog/p
\ No newline at end of file
diff --git a/app/tests/toggle-layer/normal/keycode_events.snapshot b/app/tests/toggle-layer/normal/keycode_events.snapshot
new file mode 100644
index 0000000..42174cc
--- /dev/null
+++ b/app/tests/toggle-layer/normal/keycode_events.snapshot
@@ -0,0 +1,4 @@
+tog_pressed: position 1 layer 1
+tog_released: position 1 layer 1
+kp_pressed: usage_page 0x0c keycode 0xb5
+kp_released: usage_page 0x0c keycode 0xb5
diff --git a/app/tests/toggle-layer/normal/native_posix.keymap b/app/tests/toggle-layer/normal/native_posix.keymap
new file mode 100644
index 0000000..202c105
--- /dev/null
+++ b/app/tests/toggle-layer/normal/native_posix.keymap
@@ -0,0 +1,8 @@
+#include <dt-bindings/zmk/keys.h>
+#include <behaviors.dtsi>
+#include <dt-bindings/zmk/kscan-mock.h>
+#include "../behavior_keymap.dtsi"
+
+&kscan {
+	events = <ZMK_MOCK_PRESS(0,1,10) ZMK_MOCK_RELEASE(0,1,10) ZMK_MOCK_PRESS(0,0,10) ZMK_MOCK_RELEASE(0,0,10)>;
+};
\ No newline at end of file
-- 
cgit v1.2.3


From e2f77f25c8212856a5b3b3995b8e9199b59c2650 Mon Sep 17 00:00:00 2001
From: Cody McGinnis <brainwart@gmail.com>
Date: Fri, 28 Aug 2020 16:21:31 -0400
Subject: feat(test): add testing for transparent

---
 app/tests/transparent/behavior_keymap.dtsi         | 22 ++++++++++++++++++++++
 app/tests/transparent/layered/events.patterns      |  1 +
 .../transparent/layered/keycode_events.snapshot    |  2 ++
 app/tests/transparent/layered/native_posix.keymap  |  8 ++++++++
 app/tests/transparent/normal/events.patterns       |  1 +
 .../transparent/normal/keycode_events.snapshot     |  0
 app/tests/transparent/normal/native_posix.keymap   |  8 ++++++++
 7 files changed, 42 insertions(+)
 create mode 100644 app/tests/transparent/behavior_keymap.dtsi
 create mode 100644 app/tests/transparent/layered/events.patterns
 create mode 100644 app/tests/transparent/layered/keycode_events.snapshot
 create mode 100644 app/tests/transparent/layered/native_posix.keymap
 create mode 100644 app/tests/transparent/normal/events.patterns
 create mode 100644 app/tests/transparent/normal/keycode_events.snapshot
 create mode 100644 app/tests/transparent/normal/native_posix.keymap

(limited to 'app')

diff --git a/app/tests/transparent/behavior_keymap.dtsi b/app/tests/transparent/behavior_keymap.dtsi
new file mode 100644
index 0000000..d6c5e27
--- /dev/null
+++ b/app/tests/transparent/behavior_keymap.dtsi
@@ -0,0 +1,22 @@
+#include <dt-bindings/zmk/keys.h>
+#include <behaviors.dtsi>
+#include <dt-bindings/zmk/kscan-mock.h>
+
+/ {
+	keymap {
+		compatible = "zmk,keymap";
+		label ="Default keymap";
+
+		default_layer {
+			bindings = <
+				&trans &mo 1
+				&kp A &none>;
+		};
+
+		lower_layer {
+			bindings = <
+				&trans &trans
+				&trans  &kp A>;
+		};
+	};
+};
diff --git a/app/tests/transparent/layered/events.patterns b/app/tests/transparent/layered/events.patterns
new file mode 100644
index 0000000..3c9d3f8
--- /dev/null
+++ b/app/tests/transparent/layered/events.patterns
@@ -0,0 +1 @@
+s/.*hid_listener_keycode/kp/p
\ No newline at end of file
diff --git a/app/tests/transparent/layered/keycode_events.snapshot b/app/tests/transparent/layered/keycode_events.snapshot
new file mode 100644
index 0000000..d0bd245
--- /dev/null
+++ b/app/tests/transparent/layered/keycode_events.snapshot
@@ -0,0 +1,2 @@
+kp_pressed: usage_page 0x07 keycode 0x04
+kp_released: usage_page 0x07 keycode 0x04
diff --git a/app/tests/transparent/layered/native_posix.keymap b/app/tests/transparent/layered/native_posix.keymap
new file mode 100644
index 0000000..59ea481
--- /dev/null
+++ b/app/tests/transparent/layered/native_posix.keymap
@@ -0,0 +1,8 @@
+#include <dt-bindings/zmk/keys.h>
+#include <behaviors.dtsi>
+#include <dt-bindings/zmk/kscan-mock.h>
+#include "../behavior_keymap.dtsi"
+
+&kscan {
+	events = <ZMK_MOCK_PRESS(0,1,10) ZMK_MOCK_PRESS(1,0,10) ZMK_MOCK_RELEASE(1,0,10) ZMK_MOCK_RELEASE(0,1,10)>;
+};
\ No newline at end of file
diff --git a/app/tests/transparent/normal/events.patterns b/app/tests/transparent/normal/events.patterns
new file mode 100644
index 0000000..3c9d3f8
--- /dev/null
+++ b/app/tests/transparent/normal/events.patterns
@@ -0,0 +1 @@
+s/.*hid_listener_keycode/kp/p
\ No newline at end of file
diff --git a/app/tests/transparent/normal/keycode_events.snapshot b/app/tests/transparent/normal/keycode_events.snapshot
new file mode 100644
index 0000000..e69de29
diff --git a/app/tests/transparent/normal/native_posix.keymap b/app/tests/transparent/normal/native_posix.keymap
new file mode 100644
index 0000000..94d7539
--- /dev/null
+++ b/app/tests/transparent/normal/native_posix.keymap
@@ -0,0 +1,8 @@
+#include <dt-bindings/zmk/keys.h>
+#include <behaviors.dtsi>
+#include <dt-bindings/zmk/kscan-mock.h>
+#include "../behavior_keymap.dtsi"
+
+&kscan {
+	events = <ZMK_MOCK_PRESS(0,0,10) ZMK_MOCK_RELEASE(0,0,10)>;
+};
\ No newline at end of file
-- 
cgit v1.2.3


From 79bff11ddd55204cf0ed4f43985e096a30cbf137 Mon Sep 17 00:00:00 2001
From: Cody McGinnis <brainwart@gmail.com>
Date: Fri, 28 Aug 2020 16:21:31 -0400
Subject: fancier run test stuff

---
 app/run-test.sh | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

(limited to 'app')

diff --git a/app/run-test.sh b/app/run-test.sh
index 722cb93..d923e85 100755
--- a/app/run-test.sh
+++ b/app/run-test.sh
@@ -4,14 +4,25 @@ if [ -z "$1" ]; then
 	echo "Usage: ./run-test.sh <path to testcase>"
 	exit 1
 elif [ "$1" = "all" ]; then
+	echo "" > ./build/tests/pass-fail.log
 	find tests -name native_posix.keymap -exec dirname \{\} \; | xargs -l -P 4 ./run-test.sh
-	exit $?
+	err=$?
+	sort -k2 ./build/tests/pass-fail.log
+	exit $err
 fi
 
 testcase="$1"
 echo "Running $testcase:"
 
-west build -d build/$testcase -b native_posix -- -DZMK_CONFIG=$testcase > /dev/null
-./build/$testcase/zephyr/zmk.exe | sed -e "s/.*> //" | sed -n -f $testcase/events.patterns > build/$testcase/keycode_events.log
-
-diff -au $testcase/keycode_events.snapshot build/$testcase/keycode_events.log
+west build -d build/$testcase -b native_posix -- -DZMK_CONFIG=$testcase > /dev/null 2>&1
+if [ $? -gt 0 ]; then
+	echo "FAIL: $testcase did not build" >> ./build/tests/pass-fail.log
+else
+	./build/$testcase/zephyr/zmk.exe | sed -e "s/.*> //" | sed -n -f $testcase/events.patterns > build/$testcase/keycode_events.log
+	diff -au $testcase/keycode_events.snapshot build/$testcase/keycode_events.log
+	if [ $? -gt 0 ]; then
+		echo "FAIL: $testcase" >> ./build/tests/pass-fail.log
+	else
+		echo "PASS: $testcase" >> ./build/tests/pass-fail.log
+	fi
+fi
\ No newline at end of file
-- 
cgit v1.2.3


From 4564d374776b0ade3c69bdddbf0a654aff38985e Mon Sep 17 00:00:00 2001
From: Cody McGinnis <brainwart@gmail.com>
Date: Fri, 28 Aug 2020 16:21:31 -0400
Subject: feat(test): create simple docs for creating tests

---
 app/tests/Creating Tests.md | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 app/tests/Creating Tests.md

(limited to 'app')

diff --git a/app/tests/Creating Tests.md b/app/tests/Creating Tests.md
new file mode 100644
index 0000000..5e211c0
--- /dev/null
+++ b/app/tests/Creating Tests.md	
@@ -0,0 +1,23 @@
+# Basics
+Any folder under `/app/tests` containing `native_posix.keymap` will be selected when running
+`./run-test.sh all`.
+
+`test_case/events.patterns` contains sed patterns that will select the interesting output from the
+application
+
+`test_case/keycode_events.snapshot` contains the expected output after applying `events.pattern` to
+the output
+
+`test_case/native_posix.keymap` defines the keys and the mock key presses. Most tests include a
+common keymap for their test set
+
+## Creating a New Test Set
+1. Copy the test set that most closely resembles the tests you will be creating.
+2. Rename the newly created test set to the behavior you're testing  e.g, toggle-layer
+3. Modify `behavior_keymap.dtsi` to create a keymap using the behavior and related behaviors
+4. Modify `test_case/native_posix.keymap` for a simulated use case
+5. Modify `test_case/events.patterns` to collect relevant logs to the test
+    - See: [sed manual](https://www.gnu.org/software/sed/manual/sed.html) and
+    [tutorial](https://www.digitalocean.com/community/tutorials/the-basics-of-using-the-sed-stream-editor-to-manipulate-text-in-linux)
+6. Modify `test_case/keycode_events.snapshot` for to include the expected output
+7. Repeat steps 4 to 6 for every test case
\ No newline at end of file
-- 
cgit v1.2.3


From aff39e57d041b9b3c895d3968912ef4fd9b6c6ce Mon Sep 17 00:00:00 2001
From: Cody McGinnis <brainwart@gmail.com>
Date: Fri, 28 Aug 2020 16:21:31 -0400
Subject: fix: add license header to run-test.sh

---
 app/run-test.sh | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'app')

diff --git a/app/run-test.sh b/app/run-test.sh
index d923e85..6c3e878 100755
--- a/app/run-test.sh
+++ b/app/run-test.sh
@@ -1,4 +1,9 @@
 #!/bin/sh
+#
+# Copyright (c) 2020 Peter Johanson; Cody McGinnis
+#
+# SPDX-License-Identifier: MIT
+#
 
 if [ -z "$1" ]; then
 	echo "Usage: ./run-test.sh <path to testcase>"
-- 
cgit v1.2.3


From b1d9a7b68450438a7ac6bce26bf89dfdf00a4393 Mon Sep 17 00:00:00 2001
From: Cody McGinnis <brainwart@gmail.com>
Date: Fri, 28 Aug 2020 16:21:31 -0400
Subject: feat(test): record full key log as well

---
 app/run-test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/run-test.sh b/app/run-test.sh
index 6c3e878..53277ba 100755
--- a/app/run-test.sh
+++ b/app/run-test.sh
@@ -23,7 +23,7 @@ west build -d build/$testcase -b native_posix -- -DZMK_CONFIG=$testcase > /dev/n
 if [ $? -gt 0 ]; then
 	echo "FAIL: $testcase did not build" >> ./build/tests/pass-fail.log
 else
-	./build/$testcase/zephyr/zmk.exe | sed -e "s/.*> //" | sed -n -f $testcase/events.patterns > build/$testcase/keycode_events.log
+	./build/$testcase/zephyr/zmk.exe | sed -e "s/.*> //" | tee build/$testcase/keycode_events_full.log | sed -n -f $testcase/events.patterns > build/$testcase/keycode_events.log
 	diff -au $testcase/keycode_events.snapshot build/$testcase/keycode_events.log
 	if [ $? -gt 0 ]; then
 		echo "FAIL: $testcase" >> ./build/tests/pass-fail.log
-- 
cgit v1.2.3


From 26414a69824a37a65c0fb3a6c423f4cb6c1ef068 Mon Sep 17 00:00:00 2001
From: Cody McGinnis <brainwart@gmail.com>
Date: Fri, 28 Aug 2020 16:21:31 -0400
Subject: fix(docs): move testing docs to website docs

---
 app/tests/Creating Tests.md | 23 -----------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 app/tests/Creating Tests.md

(limited to 'app')

diff --git a/app/tests/Creating Tests.md b/app/tests/Creating Tests.md
deleted file mode 100644
index 5e211c0..0000000
--- a/app/tests/Creating Tests.md	
+++ /dev/null
@@ -1,23 +0,0 @@
-# Basics
-Any folder under `/app/tests` containing `native_posix.keymap` will be selected when running
-`./run-test.sh all`.
-
-`test_case/events.patterns` contains sed patterns that will select the interesting output from the
-application
-
-`test_case/keycode_events.snapshot` contains the expected output after applying `events.pattern` to
-the output
-
-`test_case/native_posix.keymap` defines the keys and the mock key presses. Most tests include a
-common keymap for their test set
-
-## Creating a New Test Set
-1. Copy the test set that most closely resembles the tests you will be creating.
-2. Rename the newly created test set to the behavior you're testing  e.g, toggle-layer
-3. Modify `behavior_keymap.dtsi` to create a keymap using the behavior and related behaviors
-4. Modify `test_case/native_posix.keymap` for a simulated use case
-5. Modify `test_case/events.patterns` to collect relevant logs to the test
-    - See: [sed manual](https://www.gnu.org/software/sed/manual/sed.html) and
-    [tutorial](https://www.digitalocean.com/community/tutorials/the-basics-of-using-the-sed-stream-editor-to-manipulate-text-in-linux)
-6. Modify `test_case/keycode_events.snapshot` for to include the expected output
-7. Repeat steps 4 to 6 for every test case
\ No newline at end of file
-- 
cgit v1.2.3


From 80bef160fcb3c2c63f11c71832c9afd959a1828c Mon Sep 17 00:00:00 2001
From: Cody McGinnis <brainwart@gmail.com>
Date: Fri, 28 Aug 2020 16:28:49 -0400
Subject: feat(tests): allow tests to be marked as pending

pending tests will not fail the build
---
 app/run-test.sh                                     | 9 ++++++++-
 app/tests/momentary-layer/early-key-release/pending | 0
 app/tests/toggle-layer/early-key-release/pending    | 0
 3 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 app/tests/momentary-layer/early-key-release/pending
 create mode 100644 app/tests/toggle-layer/early-key-release/pending

(limited to 'app')

diff --git a/app/run-test.sh b/app/run-test.sh
index 53277ba..be335c6 100755
--- a/app/run-test.sh
+++ b/app/run-test.sh
@@ -26,8 +26,15 @@ else
 	./build/$testcase/zephyr/zmk.exe | sed -e "s/.*> //" | tee build/$testcase/keycode_events_full.log | sed -n -f $testcase/events.patterns > build/$testcase/keycode_events.log
 	diff -au $testcase/keycode_events.snapshot build/$testcase/keycode_events.log
 	if [ $? -gt 0 ]; then
-		echo "FAIL: $testcase" >> ./build/tests/pass-fail.log
+		if [ -f $testcase/pending ]; then
+			echo "PEND: $testcase" >> ./build/tests/pass-fail.log
+			exit 0
+		else
+			echo "FAIL: $testcase" >> ./build/tests/pass-fail.log
+			exit 1
+		fi
 	else
 		echo "PASS: $testcase" >> ./build/tests/pass-fail.log
+		exit 0
 	fi
 fi
\ No newline at end of file
diff --git a/app/tests/momentary-layer/early-key-release/pending b/app/tests/momentary-layer/early-key-release/pending
new file mode 100644
index 0000000..e69de29
diff --git a/app/tests/toggle-layer/early-key-release/pending b/app/tests/toggle-layer/early-key-release/pending
new file mode 100644
index 0000000..e69de29
-- 
cgit v1.2.3