Commit 4dde925f authored by Souradeep Saha's avatar Souradeep Saha Committed by Daniel Black

Cleanup Whitespace in unittest/ directory

Cleanup unnecessary whitespace at the end of lines and end of files
in the unittest/ directory. Note that all code changes are
non-functional.

All new code of the whole pull request, including one or several files
that are either new files or modified ones, are contributed under the
BSD-new license. I am contributing on behalf of my employer Amazon Web
Services, Inc.
parent d8374262
# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. # the Free Software Foundation; version 2 of the License.
# #
# This program is distributed in the hope that it will be useful, # This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
......
/* Copyright (c) 2006, 2010, Oracle and/or its affiliates /* Copyright (c) 2006, 2010, Oracle and/or its affiliates
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
......
...@@ -50,4 +50,3 @@ int main() { ...@@ -50,4 +50,3 @@ int main() {
ok(failed == 0, "Testing gcs()"); ok(failed == 0, "Testing gcs()");
return exit_status(); return exit_status();
} }
# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. # the Free Software Foundation; version 2 of the License.
# #
# This program is distributed in the hope that it will be useful, # This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
......
...@@ -116,7 +116,7 @@ test_path_parsing() ...@@ -116,7 +116,7 @@ test_path_parsing()
json_path_t p; json_path_t p;
if (json_path_setup(&p, ci, s_e(p0))) if (json_path_setup(&p, ci, s_e(p0)))
return; return;
ok(p.last_step - p.steps == 4 && ok(p.last_step - p.steps == 4 &&
p.steps[0].type == JSON_PATH_ARRAY_WILD && p.steps[0].type == JSON_PATH_ARRAY_WILD &&
p.steps[1].type == JSON_PATH_KEY && p.steps[1].type == JSON_PATH_KEY &&
p.steps[2].type == JSON_PATH_ARRAY && p.steps[2].n_item == 12 && p.steps[2].type == JSON_PATH_ARRAY && p.steps[2].n_item == 12 &&
......
# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. # the Free Software Foundation; version 2 of the License.
# #
# This program is distributed in the hope that it will be useful, # This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
......
# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. # the Free Software Foundation; version 2 of the License.
# #
# This program is distributed in the hope that it will be useful, # This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
...@@ -25,4 +25,3 @@ MY_ADD_TESTS(ma_dyncol LINK_LIBRARIES mysys) ...@@ -25,4 +25,3 @@ MY_ADD_TESTS(ma_dyncol LINK_LIBRARIES mysys)
IF(WIN32) IF(WIN32)
MY_ADD_TESTS(my_delete LINK_LIBRARIES mysys) MY_ADD_TESTS(my_delete LINK_LIBRARIES mysys)
ENDIF() ENDIF()
...@@ -71,4 +71,3 @@ int main(void) ...@@ -71,4 +71,3 @@ int main(void)
return exit_status(); return exit_status();
} }
...@@ -196,4 +196,3 @@ void do_tests() ...@@ -196,4 +196,3 @@ void do_tests()
lf_hash_destroy(&lf_hash); lf_hash_destroy(&lf_hash);
lf_alloc_destroy(&lf_allocator); lf_alloc_destroy(&lf_allocator);
} }
...@@ -35,17 +35,17 @@ int main(int argc __attribute__((unused)),char *argv[]) ...@@ -35,17 +35,17 @@ int main(int argc __attribute__((unused)),char *argv[])
/* Delete an open file */ /* Delete an open file */
ok(GetTempFileNameA(tmp_dir, "foo", 0, tmp_filename) != 0, "create temp file 2"); ok(GetTempFileNameA(tmp_dir, "foo", 0, tmp_filename) != 0, "create temp file 2");
h = CreateFileA(tmp_filename, GENERIC_READ|GENERIC_WRITE, h = CreateFileA(tmp_filename, GENERIC_READ|GENERIC_WRITE,
FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, NULL); FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, NULL);
ok (h != INVALID_HANDLE_VALUE || h != 0, "open temp file"); ok (h != INVALID_HANDLE_VALUE || h != 0, "open temp file");
ok(my_delete(tmp_filename, MYF(0)) == 0, "Delete open file"); ok(my_delete(tmp_filename, MYF(0)) == 0, "Delete open file");
/* /*
Check if it is possible to reuse file name after delete (not all handles Check if it is possible to reuse file name after delete (not all handles
to it are closed. to it are closed.
*/ */
h2 = CreateFileA(tmp_filename, GENERIC_READ|GENERIC_WRITE, h2 = CreateFileA(tmp_filename, GENERIC_READ|GENERIC_WRITE,
FILE_SHARE_DELETE, NULL, CREATE_NEW, FILE_FLAG_DELETE_ON_CLOSE, NULL); FILE_SHARE_DELETE, NULL, CREATE_NEW, FILE_FLAG_DELETE_ON_CLOSE, NULL);
ok(h2 != 0 && h2 != INVALID_HANDLE_VALUE, "Reuse file name"); ok(h2 != 0 && h2 != INVALID_HANDLE_VALUE, "Reuse file name");
CloseHandle(h); CloseHandle(h);
...@@ -54,4 +54,3 @@ int main(int argc __attribute__((unused)),char *argv[]) ...@@ -54,4 +54,3 @@ int main(int argc __attribute__((unused)),char *argv[])
my_end(0); my_end(0);
return exit_status(); return exit_status();
} }
...@@ -41,4 +41,3 @@ int main(int argc __attribute__((unused)),char *argv[]) ...@@ -41,4 +41,3 @@ int main(int argc __attribute__((unused)),char *argv[])
my_end(0); my_end(0);
return exit_status(); return exit_status();
} }
...@@ -227,4 +227,3 @@ int main(int argc __attribute__((unused)), ...@@ -227,4 +227,3 @@ int main(int argc __attribute__((unused)),
return 0; return 0;
} }
...@@ -211,4 +211,3 @@ int main(void) ...@@ -211,4 +211,3 @@ int main(void)
return exit_status(); return exit_status();
} }
...@@ -136,4 +136,3 @@ int main(int argc __attribute__((unused)), char *argv[]) ...@@ -136,4 +136,3 @@ int main(int argc __attribute__((unused)), char *argv[])
my_end(0); my_end(0);
return exit_status(); return exit_status();
} }
...@@ -70,4 +70,3 @@ int main(int argc __attribute__((unused)), char **argv) ...@@ -70,4 +70,3 @@ int main(int argc __attribute__((unused)), char **argv)
my_end(0); my_end(0);
return exit_status(); return exit_status();
} }
...@@ -283,4 +283,3 @@ void do_tests() ...@@ -283,4 +283,3 @@ void do_tests()
pthread_cond_destroy(&thread_sync); pthread_cond_destroy(&thread_sync);
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
# Copyright (c) 2007 MySQL AB, 2010 Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2007 MySQL AB, 2010 Oracle and/or its affiliates. All rights reserved.
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. # the Free Software Foundation; version 2 of the License.
# #
# This program is distributed in the hope that it will be useful, # This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
......
This diff is collapsed.
...@@ -366,7 +366,7 @@ static ulong start_timer(void) ...@@ -366,7 +366,7 @@ static ulong start_timer(void)
} }
/** /**
Write as many as 52+1 bytes to buff, in the form of a legible Write as many as 52+1 bytes to buff, in the form of a legible
duration of time. duration of time.
......
/* Copyright (c) 2006, 2010, Oracle and/or its affiliates /* Copyright (c) 2006, 2010, Oracle and/or its affiliates
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
......
# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. # the Free Software Foundation; version 2 of the License.
# #
# This program is distributed in the hope that it will be useful, # This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
......
...@@ -163,4 +163,3 @@ int main(int argc __attribute__((unused)),char *argv[]) ...@@ -163,4 +163,3 @@ int main(int argc __attribute__((unused)),char *argv[])
my_end(0); my_end(0);
return exit_status(); return exit_status();
} }
...@@ -123,8 +123,8 @@ void temp_io_cache() ...@@ -123,8 +123,8 @@ void temp_io_cache()
diag("temp io_cache with%s encryption", encrypt_tmp_files?"":"out"); diag("temp io_cache with%s encryption", encrypt_tmp_files?"":"out");
init_io_cache_encryption(); init_io_cache_encryption();
res= open_cached_file(&info, 0, 0, CACHE_SIZE, 0); res= open_cached_file(&info, 0, 0, CACHE_SIZE, 0);
ok(res == 0, "open_cached_file" INFO_TAIL); ok(res == 0, "open_cached_file" INFO_TAIL);
......
...@@ -29,9 +29,9 @@ ...@@ -29,9 +29,9 @@
A fake THD with enter_cond/exit_cond and some other members. A fake THD with enter_cond/exit_cond and some other members.
*/ */
PSI_stage_info stage_show_explain; PSI_stage_info stage_show_explain;
class THD class THD
{ {
mysql_mutex_t* thd_mutex; mysql_mutex_t* thd_mutex;
public: public:
bool killed; bool killed;
...@@ -81,7 +81,7 @@ int int_rand(int size) ...@@ -81,7 +81,7 @@ int int_rand(int size)
return (int) (0.5 + ((double)rand() / RAND_MAX) * size); return (int) (0.5 + ((double)rand() / RAND_MAX) * size);
} }
/* /*
APC target thread (the one that will serve the APC requests). We will have APC target thread (the one that will serve the APC requests). We will have
one target. one target.
*/ */
...@@ -119,7 +119,7 @@ void *test_apc_service_thread(void *ptr) ...@@ -119,7 +119,7 @@ void *test_apc_service_thread(void *ptr)
class Apc_order : public Apc_target::Apc_call class Apc_order : public Apc_target::Apc_call
{ {
public: public:
int value; // The value int value; // The value
int *where_to; // Where to write it int *where_to; // Where to write it
Apc_order(int a, int *b) : value(a), where_to(b) {} Apc_order(int a, int *b) : value(a), where_to(b) {}
...@@ -202,7 +202,7 @@ int main(int args, char **argv) ...@@ -202,7 +202,7 @@ int main(int args, char **argv)
my_sleep(1000); my_sleep(1000);
for (i = 0; i < N_THREADS; i++) for (i = 0; i < N_THREADS; i++)
pthread_create(&request_thr[i], NULL, test_apc_requestor_thread, (void*)NULL); pthread_create(&request_thr[i], NULL, test_apc_requestor_thread, (void*)NULL);
for (i = 0; i < 15; i++) for (i = 0; i < 15; i++)
{ {
my_sleep(500*1000); my_sleep(500*1000);
...@@ -212,7 +212,7 @@ int main(int args, char **argv) ...@@ -212,7 +212,7 @@ int main(int args, char **argv)
requestors_should_exit= TRUE; requestors_should_exit= TRUE;
for (i = 0; i < N_THREADS; i++) for (i = 0; i < N_THREADS; i++)
pthread_join(request_thr[i], NULL); pthread_join(request_thr[i], NULL);
diag("Shutting down service"); diag("Shutting down service");
service_should_exit= TRUE; service_should_exit= TRUE;
pthread_join(service_thr, NULL); pthread_join(service_thr, NULL);
...@@ -226,4 +226,3 @@ int main(int args, char **argv) ...@@ -226,4 +226,3 @@ int main(int args, char **argv)
ok1(!have_errors); ok1(!have_errors);
return exit_status(); return exit_status();
} }
...@@ -30,7 +30,7 @@ class Json_writer; ...@@ -30,7 +30,7 @@ class Json_writer;
/* Several fake objects */ /* Several fake objects */
class Opt_trace class Opt_trace
{ {
public: public:
void enable_tracing_if_required() {} void enable_tracing_if_required() {}
...@@ -38,7 +38,7 @@ class Opt_trace ...@@ -38,7 +38,7 @@ class Opt_trace
Json_writer *get_current_json() { return nullptr; } Json_writer *get_current_json() { return nullptr; }
}; };
class THD class THD
{ {
public: public:
Opt_trace opt_trace; Opt_trace opt_trace;
...@@ -60,7 +60,7 @@ int main(int args, char **argv) ...@@ -60,7 +60,7 @@ int main(int args, char **argv)
{ {
Json_writer w; Json_writer w;
w.start_object(); w.start_object();
w.add_member("foo"); w.add_member("foo");
w.end_object(); w.end_object();
ok(w.invalid_json, "Started a name but didn't add a value"); ok(w.invalid_json, "Started a name but didn't add a value");
} }
...@@ -143,4 +143,3 @@ int main(int args, char **argv) ...@@ -143,4 +143,3 @@ int main(int args, char **argv)
return exit_status(); return exit_status();
} }
MY_ADD_TESTS(strings json LINK_LIBRARIES strings mysys) MY_ADD_TESTS(strings json LINK_LIBRARIES strings mysys)
...@@ -52,7 +52,7 @@ test_like_range_for_charset(CHARSET_INFO *cs, const char *src, size_t src_len) ...@@ -52,7 +52,7 @@ test_like_range_for_charset(CHARSET_INFO *cs, const char *src, size_t src_len)
char min_str[32], max_str[32]; char min_str[32], max_str[32];
size_t min_len, max_len, min_well_formed_len, max_well_formed_len; size_t min_len, max_len, min_well_formed_len, max_well_formed_len;
int error= 0; int error= 0;
my_ci_like_range(cs, src, src_len, '\\', '_', '%', my_ci_like_range(cs, src, src_len, '\\', '_', '%',
sizeof(min_str), min_str, max_str, &min_len, &max_len); sizeof(min_str), min_str, max_str, &min_len, &max_len);
diag("min_len=%d\tmax_len=%d\t%s", (int) min_len, (int) max_len, diag("min_len=%d\tmax_len=%d\t%s", (int) min_len, (int) max_len,
...@@ -144,7 +144,7 @@ typedef struct ...@@ -144,7 +144,7 @@ typedef struct
but not followed by a valid T2 byte. but not followed by a valid T2 byte.
Charset H2 T2 8BIT Charset H2 T2 8BIT
------- ---------------- --------------- -------- ------- ---------------- --------------- --------
big5 [A1..F9] [40..7E,A1..FE] big5 [A1..F9] [40..7E,A1..FE]
euckr [81..FE] [41..5A,61..7A,81..FE] euckr [81..FE] [41..5A,61..7A,81..FE]
gb2312 [A1..F7] [A1..FE] gb2312 [A1..F7] [A1..FE]
...@@ -1554,7 +1554,7 @@ int main(int ac, char **av) ...@@ -1554,7 +1554,7 @@ int main(int ac, char **av)
plan(4); plan(4);
diag("Testing my_like_range_xxx() functions"); diag("Testing my_like_range_xxx() functions");
for (i= 0; i < array_elements(charset_list); i++) for (i= 0; i < array_elements(charset_list); i++)
{ {
CHARSET_INFO *cs= charset_list[i]; CHARSET_INFO *cs= charset_list[i];
......
...@@ -78,7 +78,7 @@ BEGIN { ...@@ -78,7 +78,7 @@ BEGIN {
sub _find_test_files (@) { sub _find_test_files (@) {
my @dirs = @_; my @dirs = @_;
my @files; my @files;
find sub { find sub {
$File::Find::prune = 1 if /^(SCCS|\.libs)$/; $File::Find::prune = 1 if /^(SCCS|\.libs)$/;
push(@files, $File::Find::name) if -x _ && (/-t\z/ || /-t\.exe\z/); push(@files, $File::Find::name) if -x _ && (/-t\z/ || /-t\.exe\z/);
}, @dirs; }, @dirs;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment