Rename duplicate source files
This fixes an error with toolchains that don't include the extension in
the .o filename.
Change-Id: I1fe46d127cade90e6c3d330ee45937c2ea8665eb
diff --git a/pw_assert/BUILD b/pw_assert/BUILD
index 32be4ad..16e8cec 100644
--- a/pw_assert/BUILD
+++ b/pw_assert/BUILD
@@ -73,7 +73,7 @@
pw_cc_test(
name = "assert_backend_compile_test",
srcs = [
- "assert_backend_compile_test.c",
+ "assert_backend_compile_test_c.c",
"assert_backend_compile_test.cc",
],
deps = [
diff --git a/pw_assert/BUILD.gn b/pw_assert/BUILD.gn
index 417e0b2..d8d1ad1 100644
--- a/pw_assert/BUILD.gn
+++ b/pw_assert/BUILD.gn
@@ -69,8 +69,8 @@
pw_assert_BACKEND,
]
sources = [
- "assert_backend_compile_test.c",
"assert_backend_compile_test.cc",
+ "assert_backend_compile_test_c.c",
]
}
diff --git a/pw_assert/assert_backend_compile_test.c b/pw_assert/assert_backend_compile_test_c.c
similarity index 100%
rename from pw_assert/assert_backend_compile_test.c
rename to pw_assert/assert_backend_compile_test_c.c
diff --git a/pw_base64/BUILD b/pw_base64/BUILD
index 67bdfb4..f30a5bc 100644
--- a/pw_base64/BUILD
+++ b/pw_base64/BUILD
@@ -39,7 +39,7 @@
pw_cc_test(
name = "base64_test",
srcs = [
- "base64_test.c",
+ "base64_test_c.c",
"base64_test.cc",
],
deps = [
diff --git a/pw_base64/BUILD.gn b/pw_base64/BUILD.gn
index 47b95c7..6fdc1dc 100644
--- a/pw_base64/BUILD.gn
+++ b/pw_base64/BUILD.gn
@@ -38,8 +38,8 @@
pw_test("base64_test") {
deps = [ ":pw_base64" ]
sources = [
- "base64_test.c",
"base64_test.cc",
+ "base64_test_c.c",
]
}
diff --git a/pw_base64/base64_test.c b/pw_base64/base64_test_c.c
similarity index 99%
rename from pw_base64/base64_test.c
rename to pw_base64/base64_test_c.c
index be772b8..b2b566f 100644
--- a/pw_base64/base64_test.c
+++ b/pw_base64/base64_test_c.c
@@ -17,10 +17,10 @@
//
// The encoded / decoded size macros are tested in the main C++ tests.
-#include "pw_base64/base64.h"
-
#include <stddef.h>
+#include "pw_base64/base64.h"
+
void pw_Base64CallEncode(const void* binary_data,
const size_t binary_size_bytes,
char* output) {
diff --git a/pw_checksum/BUILD b/pw_checksum/BUILD
index 63c1e2f..8f1ce29 100644
--- a/pw_checksum/BUILD
+++ b/pw_checksum/BUILD
@@ -37,7 +37,7 @@
pw_cc_test(
name = "ccitt_crc16_test",
srcs = [
- "ccitt_crc16_test.c",
+ "ccitt_crc16_test_c.c",
"ccitt_crc16_test.cc",
],
deps = [
diff --git a/pw_checksum/BUILD.gn b/pw_checksum/BUILD.gn
index bfdd947..0dec534 100644
--- a/pw_checksum/BUILD.gn
+++ b/pw_checksum/BUILD.gn
@@ -36,8 +36,8 @@
pw_test("ccitt_crc16_test") {
deps = [ ":pw_checksum" ]
sources = [
- "ccitt_crc16_test.c",
"ccitt_crc16_test.cc",
+ "ccitt_crc16_test_c.c",
]
}
diff --git a/pw_checksum/ccitt_crc16_test.c b/pw_checksum/ccitt_crc16_test_c.c
similarity index 100%
rename from pw_checksum/ccitt_crc16_test.c
rename to pw_checksum/ccitt_crc16_test_c.c
diff --git a/pw_status/BUILD b/pw_status/BUILD
index 1ffb738..fb5a645 100644
--- a/pw_status/BUILD
+++ b/pw_status/BUILD
@@ -35,7 +35,7 @@
pw_cc_test(
name = "status_test",
srcs = [
- "status_test.c",
+ "status_test_c.c",
"status_test.cc",
],
deps = [
diff --git a/pw_status/BUILD.gn b/pw_status/BUILD.gn
index cf13386..0522ad2 100644
--- a/pw_status/BUILD.gn
+++ b/pw_status/BUILD.gn
@@ -41,8 +41,8 @@
pw_test("status_test") {
deps = [ ":pw_status" ]
sources = [
- "status_test.c",
"status_test.cc",
+ "status_test_c.c",
]
}
diff --git a/pw_status/status_test.c b/pw_status/status_test_c.c
similarity index 99%
rename from pw_status/status_test.c
rename to pw_status/status_test_c.c
index 6a99679..d4f551d 100644
--- a/pw_status/status_test.c
+++ b/pw_status/status_test_c.c
@@ -12,10 +12,10 @@
// License for the specific language governing permissions and limitations under
// the License.
-#include "pw_status/status.h"
-
#include <string.h>
+#include "pw_status/status.h"
+
pw_Status PassStatusFromC(pw_Status status) { return status; }
pw_Status PassStatusFromCpp(pw_Status status);
diff --git a/pw_tokenizer/BUILD b/pw_tokenizer/BUILD
index 3de81eb..020db7b 100644
--- a/pw_tokenizer/BUILD
+++ b/pw_tokenizer/BUILD
@@ -150,7 +150,7 @@
pw_cc_test(
name = "argument_types_test",
srcs = [
- "argument_types_test.c",
+ "argument_types_test_c.c",
"argument_types_test.cc",
"pw_tokenizer_private/argument_types_test.h",
"tokenize_test_fakes.cc",
@@ -202,7 +202,7 @@
pw_cc_test(
name = "global_handlers_test",
srcs = [
- "global_handlers_test.c",
+ "global_handlers_test_c.c",
"global_handlers_test.cc",
"pw_tokenizer_private/tokenize_test.h",
],
@@ -252,7 +252,7 @@
name = "tokenize_test",
srcs = [
"pw_tokenizer_private/tokenize_test.h",
- "tokenize_test.c",
+ "tokenize_test_c.c",
"tokenize_test.cc",
],
deps = [
diff --git a/pw_tokenizer/BUILD.gn b/pw_tokenizer/BUILD.gn
index 21cc779..20c0c4f 100644
--- a/pw_tokenizer/BUILD.gn
+++ b/pw_tokenizer/BUILD.gn
@@ -169,8 +169,8 @@
pw_test("argument_types_test") {
sources = [
- "argument_types_test.c",
"argument_types_test.cc",
+ "argument_types_test_c.c",
"pw_tokenizer_private/argument_types_test.h",
"tokenize_test_fakes.cc",
]
@@ -201,8 +201,8 @@
pw_test("global_handlers_test") {
sources = [
- "global_handlers_test.c",
"global_handlers_test.cc",
+ "global_handlers_test_c.c",
"pw_tokenizer_private/tokenize_test.h",
]
deps = [
@@ -280,8 +280,8 @@
pw_test("tokenize_test") {
sources = [
"pw_tokenizer_private/tokenize_test.h",
- "tokenize_test.c",
"tokenize_test.cc",
+ "tokenize_test_c.c",
]
deps = [
":pw_tokenizer",
diff --git a/pw_tokenizer/argument_types_test.c b/pw_tokenizer/argument_types_test_c.c
similarity index 99%
rename from pw_tokenizer/argument_types_test.c
rename to pw_tokenizer/argument_types_test_c.c
index 08ec027..f594200 100644
--- a/pw_tokenizer/argument_types_test.c
+++ b/pw_tokenizer/argument_types_test_c.c
@@ -15,11 +15,11 @@
// This C source file tests that the tokenizer argument type encoding works
// correctly in C. These functions are called from the main C++ test file
// argument_types_test.cc.
-#include "pw_tokenizer_private/argument_types_test.h"
-
#include <assert.h>
#include <stddef.h>
+#include "pw_tokenizer_private/argument_types_test.h"
+
#ifdef __cplusplus
#error "This is a test of C code and must be compiled as C, not C++."
#endif // __cplusplus
diff --git a/pw_tokenizer/global_handlers_test.c b/pw_tokenizer/global_handlers_test_c.c
similarity index 100%
rename from pw_tokenizer/global_handlers_test.c
rename to pw_tokenizer/global_handlers_test_c.c
diff --git a/pw_tokenizer/tokenize_test.c b/pw_tokenizer/tokenize_test_c.c
similarity index 99%
rename from pw_tokenizer/tokenize_test.c
rename to pw_tokenizer/tokenize_test_c.c
index 908fcac..f012cb8 100644
--- a/pw_tokenizer/tokenize_test.c
+++ b/pw_tokenizer/tokenize_test_c.c
@@ -15,9 +15,8 @@
// This function tests the C implementation of tokenization API. These functions
// are called from the main C++ test file.
-#include "pw_tokenizer_private/tokenize_test.h"
-
#include "pw_tokenizer/tokenize.h"
+#include "pw_tokenizer_private/tokenize_test.h"
#ifdef __cplusplus
#error "This is a test of C code and must be compiled as C, not C++."
diff --git a/pw_trace/BUILD b/pw_trace/BUILD
index d84f847..f99a54d 100644
--- a/pw_trace/BUILD
+++ b/pw_trace/BUILD
@@ -52,7 +52,7 @@
name = "trace_backend_compile_test",
srcs = [
"trace_backend_compile_test.cc",
- "trace_backend_compile_test.c",
+ "trace_backend_compile_test_c.c",
],
deps = [
":backend",
diff --git a/pw_trace/trace_backend_compile_test.c b/pw_trace/trace_backend_compile_test_c.c
similarity index 100%
rename from pw_trace/trace_backend_compile_test.c
rename to pw_trace/trace_backend_compile_test_c.c
diff --git a/pw_varint/BUILD b/pw_varint/BUILD
index e37d4cf..1104fdb 100644
--- a/pw_varint/BUILD
+++ b/pw_varint/BUILD
@@ -41,7 +41,7 @@
pw_cc_test(
name = "varint_test",
srcs = [
- "varint_test.c",
+ "varint_test_c.c",
"varint_test.cc",
],
deps = [
diff --git a/pw_varint/BUILD.gn b/pw_varint/BUILD.gn
index 8205bff..5b55b7b 100644
--- a/pw_varint/BUILD.gn
+++ b/pw_varint/BUILD.gn
@@ -42,8 +42,8 @@
pw_test("varint_test") {
deps = [ ":pw_varint" ]
sources = [
- "varint_test.c",
"varint_test.cc",
+ "varint_test_c.c",
]
}
diff --git a/pw_varint/varint_test.c b/pw_varint/varint_test_c.c
similarity index 99%
rename from pw_varint/varint_test.c
rename to pw_varint/varint_test_c.c
index e0ee8db..232dab3 100644
--- a/pw_varint/varint_test.c
+++ b/pw_varint/varint_test_c.c
@@ -15,10 +15,10 @@
// These tests call the pw_varint module API from C. The return values are
// checked in the main C++ tests.
-#include "pw_varint/varint.h"
-
#include <stddef.h>
+#include "pw_varint/varint.h"
+
size_t pw_VarintCallEncode(uint64_t integer, void* output, size_t output_size) {
return pw_VarintEncode(integer, output, output_size);
}
