fp_sensor_mock: Rename fp_sensor_mock

Rename fp_sensor_mock files to fpsensor_mock to be consistent with other
file names. This helps avoid issues with scripts using pattern matched
filenames, such as util/migrated_files.sh.

BRANCH=none
BUG=none
TEST=compare_build.sh -b fp => MATCH
TEST=make BOARD=bloonchipper tests
TEST=make BOARD=dartmonkey tests

Change-Id: I6f7e213cbf72a59cfd5994c66dc7b93ea44c6505
Signed-off-by: Bobby Casey <bobbycasey@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4334695
Reviewed-by: Tom Hughes <tomhughes@chromium.org>

7 files changed, 10 insertions, 10 deletions

diff --git a/common/mock/README.md b/common/mock/README.md
index 62f53f5416..ab91f9f927 100644
--- a/common/mock/README.md
+++ b/common/mock/README.md
@@ -45,7 +45,7 @@ Example `.mocklist`:
 
  #define CONFIG_TEST_MOCK_LIST \
     MOCK(ROLLBACK)             \
-    MOCK(FP_SENSOR)
+    MOCK(FPSENSOR)
 ```
 
 If you need additional [mock control](#mock-controls) functionality, you may
@@ -79,10 +79,10 @@ which resides in [include/mock](/include/mock).
 
 *   When creating mock controls, consider placing all your mock parameters in
     one externally facing struct, like in
-    [fp_sensor_mock.h](/include/mock/fp_sensor_mock.h). The primary reason for
+    [fpsensor_mock.h](/include/mock/fpsensor_mock.h). The primary reason for
     this is to allow the mock to be easily used by a fuzzer (write random bytes
     into the struct with memcpy).
 *   When following the above pattern, please provide a macro for resetting
     default values for this struct, like in
-    [fp_sensor_mock.h](/include/mock/fp_sensor_mock.h). This allows unit tests
+    [fpsensor_mock.h](/include/mock/fpsensor_mock.h). This allows unit tests
     to quickly reset the mock state/parameters before each unrelated unit test.
diff --git a/common/mock/build.mk b/common/mock/build.mk
index f2fca72328..00c4693d7f 100644
--- a/common/mock/build.mk
+++ b/common/mock/build.mk
@@ -7,7 +7,7 @@
 mock-$(HAS_MOCK_ADC) += adc_mock.o
 mock-$(HAS_MOCK_BATTERY) += battery_mock.o
 mock-$(HAS_MOCK_CHARGE_MANAGER) += charge_manager_mock.o
-mock-$(HAS_MOCK_FP_SENSOR) += fp_sensor_mock.o
+mock-$(HAS_MOCK_FPSENSOR) += fpsensor_mock.o
 mock-$(HAS_MOCK_FPSENSOR_CRYPTO) += fpsensor_crypto_mock.o
 mock-$(HAS_MOCK_FPSENSOR_DETECT) += fpsensor_detect_mock.o
 mock-$(HAS_MOCK_FPSENSOR_STATE) += fpsensor_state_mock.o
diff --git a/common/mock/fp_sensor_mock.c b/common/mock/fpsensor_mock.c
index 57a4f42ae9..8540d30f1c 100644
--- a/common/mock/fp_sensor_mock.c
+++ b/common/mock/fpsensor_mock.c
@@ -10,7 +10,7 @@
 
 #include "common.h"
 #include "fpsensor.h"
-#include "mock/fp_sensor_mock.h"
+#include "mock/fpsensor_mock.h"
 
 #include <stdlib.h>
 
diff --git a/driver/fingerprint/fpsensor_driver.h b/driver/fingerprint/fpsensor_driver.h
index c7773e44d8..e5cdc78d3d 100644
--- a/driver/fingerprint/fpsensor_driver.h
+++ b/driver/fingerprint/fpsensor_driver.h
@@ -38,7 +38,7 @@
 #if defined(HAVE_PRIVATE) && defined(TEST_BUILD)
 /*
  * For unittest in a private build, enable driver-related code in
- * common/fpsensor/ so that they can be tested (with fp_sensor_mock).
+ * common/fpsensor/ so that they can be tested (with fpsensor_mock).
  */
 #define HAVE_FP_PRIVATE_DRIVER
 #endif
diff --git a/fuzz/host_command_fuzz.mocklist b/fuzz/host_command_fuzz.mocklist
index 3b7d03ee0e..9dc068bce7 100644
--- a/fuzz/host_command_fuzz.mocklist
+++ b/fuzz/host_command_fuzz.mocklist
@@ -4,7 +4,7 @@
  */
 
  #define CONFIG_TEST_MOCK_LIST \
-	MOCK(FP_SENSOR)        \
+	MOCK(FPSENSOR)        \
 	MOCK(FPSENSOR_DETECT)  \
 	MOCK(MKBP_EVENTS)      \
 	MOCK(ROLLBACK)
diff --git a/include/mock/fp_sensor_mock.h b/include/mock/fpsensor_mock.h
index 338a03b7e9..dae485b859 100644
--- a/include/mock/fp_sensor_mock.h
+++ b/include/mock/fpsensor_mock.h
@@ -8,8 +8,8 @@
  * @brief Controls for the mock fpsensor private driver
  */
 
-#ifndef __MOCK_FP_SENSOR_MOCK_H
-#define __MOCK_FP_SENSOR_MOCK_H
+#ifndef __MOCK_FPSENSOR_MOCK_H
+#define __MOCK_FPSENSOR_MOCK_H
 
 #include "common.h"
 #include "fpsensor.h"
diff --git a/test/fpsensor.mocklist b/test/fpsensor.mocklist
index 3f2c60c583..84972487c9 100644
--- a/test/fpsensor.mocklist
+++ b/test/fpsensor.mocklist
@@ -5,7 +5,7 @@
 
 #ifdef BOARD_HOST
 #define CONFIG_TEST_MOCK_LIST \
-	MOCK(FP_SENSOR)       \
+	MOCK(FPSENSOR)       \
 	MOCK(FPSENSOR_CRYPTO) \
 	MOCK(FPSENSOR_DETECT) \
 	MOCK(FPSENSOR_STATE)  \