Have test/* global variable names start with g_

This commit is contained in:
Nigel Tao committed 2020-03-27 17:12:38 +11:00
1 parent c0bd9df978
commit b72dd16f9b
11 files changed
+458 -453

No files matched your search

+14 -13
View File
@@ -69,11 +69,11 @@ the first "./a.out" with "./a.out -bench". Combine these changes with the
// ---------------- Golden Tests
golden_test crc32_midsummer_gt = {
golden_test g_crc32_midsummer_gt = {
.src_filename = "test/data/midsummer.txt",
};
golden_test crc32_pi_gt = {
golden_test g_crc32_pi_gt = {
.src_filename = "test/data/pi.txt",
};
@@ -134,7 +134,7 @@ test_wuffs_crc32_ieee_golden() {
int tc;
for (tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) {
wuffs_base__io_buffer src = ((wuffs_base__io_buffer){
.data = global_src_slice,
.data = g_src_slice_u8,
});
CHECK_STRING(read_file(&src, test_cases[tc].filename));
@@ -267,7 +267,7 @@ test_mimic_crc32_ieee_pi() {
// ---------------- CRC32 Benches
uint32_t global_wuffs_crc32_unused_u32;
uint32_t g_wuffs_crc32_unused_u32;
const char* //
wuffs_bench_crc32_ieee(wuffs_base__io_buffer* dst,
@@ -283,7 +283,7 @@ wuffs_bench_crc32_ieee(wuffs_base__io_buffer* dst,
CHECK_STATUS("initialize", wuffs_crc32__ieee_hasher__initialize(
&checksum, sizeof checksum, WUFFS_VERSION,
wuffs_initialize_flags));
global_wuffs_crc32_unused_u32 = wuffs_crc32__ieee_hasher__update_u32(
g_wuffs_crc32_unused_u32 = wuffs_crc32__ieee_hasher__update_u32(
&checksum, ((wuffs_base__slice_u8){
.ptr = src->data.ptr + src->meta.ri,
.len = len,
@@ -298,7 +298,7 @@ bench_wuffs_crc32_ieee_10k() {
return do_bench_io_buffers(
wuffs_bench_crc32_ieee,
WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, tcounter_src,
&crc32_midsummer_gt, UINT64_MAX, UINT64_MAX, 1500);
&g_crc32_midsummer_gt, UINT64_MAX, UINT64_MAX, 1500);
}
const char* //
@@ -307,7 +307,7 @@ bench_wuffs_crc32_ieee_100k() {
return do_bench_io_buffers(
wuffs_bench_crc32_ieee,
WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, tcounter_src,
&crc32_pi_gt, UINT64_MAX, UINT64_MAX, 150);
&g_crc32_pi_gt, UINT64_MAX, UINT64_MAX, 150);
}
// ---------------- Mimic Benches
@@ -318,14 +318,15 @@ const char* //
bench_mimic_crc32_ieee_10k() {
CHECK_FOCUS(__func__);
return do_bench_io_buffers(mimic_bench_crc32_ieee, 0, tcounter_src,
&crc32_midsummer_gt, UINT64_MAX, UINT64_MAX, 1500);
&g_crc32_midsummer_gt, UINT64_MAX, UINT64_MAX,
1500);
}
const char* //
bench_mimic_crc32_ieee_100k() {
CHECK_FOCUS(__func__);
return do_bench_io_buffers(mimic_bench_crc32_ieee, 0, tcounter_src,
&crc32_pi_gt, UINT64_MAX, UINT64_MAX, 150);
&g_crc32_pi_gt, UINT64_MAX, UINT64_MAX, 150);
}
#endif // WUFFS_MIMIC
@@ -335,7 +336,7 @@ bench_mimic_crc32_ieee_100k() {
// Note that the crc32 mimic tests and benches don't work with
// WUFFS_MIMICLIB_USE_MINIZ_INSTEAD_OF_ZLIB.
proc tests[] = {
proc g_tests[] = {
test_wuffs_crc32_ieee_golden,
test_wuffs_crc32_ieee_interface,
@@ -350,7 +351,7 @@ proc tests[] = {
NULL,
};
proc benches[] = {
proc g_benches[] = {
bench_wuffs_crc32_ieee_10k,
bench_wuffs_crc32_ieee_100k,
@@ -367,6 +368,6 @@ proc benches[] = {
int //
main(int argc, char** argv) {
proc_package_name = "std/crc32";
return test_main(argc, argv, tests, benches);
g_proc_package_name = "std/crc32";
return test_main(argc, argv, g_tests, g_benches);
}