Skip to content

M
mariadb
Commit 5de67390 authored by unknown's avatar unknown
Browse files
Options

WL#964 

    renamed client_test to mysql_client_test
    fixed name for lstat in removef()
    added mysql-debug.exe for Windows
    added enviroment variable MYSQL_CLIENT_TEST
    added cleaning directory before tests
    New BitKeeper file ``VC++Files/tests/mysql_client_test.dsp''
    Delete: VC++Files/tests/client_test.dsp



BitKeeper/deleted/.del-client_test.dsp~659d0237a4c12ea1:
  Delete: VC++Files/tests/client_test.dsp
VC++Files/mysql.dsw:
  renamed client_test to mysql_client_test
mysql-test/my_manage.c:
  fixed name for lstat in removef()
mysql-test/mysql_test_run_new.c:
  added mysql-debug.exe for Windows
  added enviroment variable MYSQL_CLIENT_TEST
  added cleaning directory before tests
parent dc472dca
Show whitespace changes
Inline Side-by-side
Showing with 69 additions and 32 deletions
VC++Files/mysql.dsw
View file @ 5de67390
...@@ -819,7 +819,8 @@ Package=<4> ...@@ -819,7 +819,8 @@ Package=<4>
Project: "mysqltest"=.\client\mysqltest.dsp - Package Owner=<4> Project: "mysqltest"=.\client\mysqltest.dsp - Package Owner=<4>
Package=<5> Package=<5>
{{{ }}} {{{
}}}
Package=<4> Package=<4>
...@@ -834,7 +835,19 @@ Package=<4> ...@@ -834,7 +835,19 @@ Package=<4>
End Project Dependency End Project Dependency
}}} }}}
############################################################################### Project: "client_test"=.\tests\client_test.dsp - Package Owner=<4> Package=<5> {{{ }}} Package=<4> {{{ }}} ############################################################################### ###############################################################################
Project: "mysql_client_test"=.\tests\mysql_client_test.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "mysql_test_run_new"=".\mysql-test\mysql_test_run_new.dsp" - Package Owner=<4> Project: "mysql_test_run_new"=".\mysql-test\mysql_test_run_new.dsp" - Package Owner=<4>
...@@ -851,7 +864,7 @@ Package=<4> ...@@ -851,7 +864,7 @@ Package=<4>
Project_Dep_Name mysqladmin Project_Dep_Name mysqladmin
End Project Dependency End Project Dependency
Begin Project Dependency Begin Project Dependency
Project_Dep_Name client_test Project_Dep_Name mysql_client_test
End Project Dependency End Project Dependency
}}} }}}
......
VC++Files/tests/client_test.dsp → VC++Files/tests/mysql_client_test.dsp
View file @ 5de67390
# Microsoft Developer Studio Project File - Name="client_test" - Package Owner=<4> # Microsoft Developer Studio Project File - Name="mysql_client_test" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00 # Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT ** # ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103 # TARGTYPE "Win32 (x86) Console Application" 0x0103
CFG=client_test - Win32 Debug CFG=mysql_client_test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run !MESSAGE use the Export Makefile command and run
!MESSAGE !MESSAGE
!MESSAGE NMAKE /f "client_test.mak". !MESSAGE NMAKE /f "mysql_client_test.mak".
!MESSAGE !MESSAGE
!MESSAGE You can specify a configuration when running NMAKE !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE !MESSAGE
!MESSAGE NMAKE /f "client_test.mak" CFG="client_test - Win32 Debug" !MESSAGE NMAKE /f "mysql_client_test.mak" CFG="mysql_client_test - Win32 Debug"
!MESSAGE !MESSAGE
!MESSAGE Possible choices for configuration are: !MESSAGE Possible choices for configuration are:
!MESSAGE !MESSAGE
!MESSAGE "client_test - Win32 Debug" (based on "Win32 (x86) Console Application") !MESSAGE "mysql_client_test - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE "client_test - Win32 Release" (based on "Win32 (x86) Console Application") !MESSAGE "mysql_client_test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE !MESSAGE
# Begin Project # Begin Project
...@@ -29,7 +29,7 @@ CPP=cl.exe ...@@ -29,7 +29,7 @@ CPP=cl.exe
MTL=midl.exe MTL=midl.exe
RSC=rc.exe RSC=rc.exe
!IF "$(CFG)" == "client_test - Win32 Debug" !IF "$(CFG)" == "mysql_client_test - Win32 Debug"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1 # PROP BASE Use_Debug_Libraries 1
...@@ -41,20 +41,20 @@ RSC=rc.exe ...@@ -41,20 +41,20 @@ RSC=rc.exe
# PROP Output_Dir ".\Debug" # PROP Output_Dir ".\Debug"
# PROP Intermediate_Dir ".\Debug" # PROP Intermediate_Dir ".\Debug"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /I "../include" /I "../" /Z7 /W3 /Od /G6 /D "_DEBUG" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "__WIN__" /D "_WIN32" /Fp".\Debug/client_test.pch" /Fo".\Debug/" /Fd".\Debug/" /GZ /c /GX # ADD BASE CPP /nologo /MTd /I "../include" /I "../" /Z7 /W3 /Od /G6 /D "_DEBUG" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "__WIN__" /D "_WIN32" /Fp".\Debug/mysql_client_test.pch" /Fo".\Debug/" /Fd".\Debug/" /GZ /c /GX
# ADD CPP /nologo /MTd /I "../include" /I "../" /Z7 /W3 /Od /G6 /D "_DEBUG" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "__WIN__" /D "_WIN32" /Fp".\Debug/client_test.pch" /Fo".\Debug/" /Fd".\Debug/" /GZ /c /GX # ADD CPP /nologo /MTd /I "../include" /I "../" /Z7 /W3 /Od /G6 /D "_DEBUG" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "__WIN__" /D "_WIN32" /Fp".\Debug/mysql_client_test.pch" /Fo".\Debug/" /Fd".\Debug/" /GZ /c /GX
# ADD BASE MTL /nologo /tlb".\Debug\client_test.tlb" /win32 # ADD BASE MTL /nologo /tlb".\Debug\mysql_client_test.tlb" /win32
# ADD MTL /nologo /tlb".\Debug\client_test.tlb" /win32 # ADD MTL /nologo /tlb".\Debug\mysql_client_test.tlb" /win32
# ADD BASE RSC /l 1033 # ADD BASE RSC /l 1033
# ADD RSC /l 1033 # ADD RSC /l 1033
BSC32=bscmake.exe BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib mysys.lib regex.lib /nologo /out:"..\tests\client_test.exe" /incremental:yes /libpath:"..\lib_debug\" /debug /pdb:".\Debug\client_test.pdb" /pdbtype:sept /map:".\Debug\client_test.map" /subsystem:console # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib mysys.lib regex.lib /nologo /out:"..\tests\mysql_client_test.exe" /incremental:yes /libpath:"..\lib_debug\" /debug /pdb:".\Debug\mysql_client_test.pdb" /pdbtype:sept /map:".\Debug\mysql_client_test.map" /subsystem:console
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib mysys.lib regex.lib /nologo /out:"..\tests\client_test.exe" /incremental:yes /libpath:"..\lib_debug\" /debug /pdb:".\Debug\client_test.pdb" /pdbtype:sept /map:".\Debug\client_test.map" /subsystem:console # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib mysys.lib regex.lib /nologo /out:"..\tests\mysql_client_test.exe" /incremental:yes /libpath:"..\lib_debug\" /debug /pdb:".\Debug\mysql_client_test.pdb" /pdbtype:sept /map:".\Debug\mysql_client_test.map" /subsystem:console
!ELSEIF "$(CFG)" == "client_test - Win32 Release" !ELSEIF "$(CFG)" == "mysql_client_test - Win32 Release"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0 # PROP BASE Use_Debug_Libraries 0
...@@ -83,11 +83,11 @@ LINK32=link.exe ...@@ -83,11 +83,11 @@ LINK32=link.exe
# Begin Target # Begin Target
# Name "client_test - Win32 Debug" # Name "mysql_client_test - Win32 Debug"
# Name "client_test - Win32 Release" # Name "mysql_client_test - Win32 Release"
# Begin Source File # Begin Source File
SOURCE=mysql_client_test.c SOURCE=tests\mysql_client_test.c
# End Source File # End Source File
# End Target # End Target
# End Project # End Project
......
mysql-test/my_manage.c
View file @ 5de67390
...@@ -800,7 +800,15 @@ int removef(const char *format, ...) ...@@ -800,7 +800,15 @@ int removef(const char *format, ...)
#ifndef STRUCT_DIRENT_HAS_D_TYPE #ifndef STRUCT_DIRENT_HAS_D_TYPE
struct stat st; struct stat st;
if (lstat(entry->d_name, &st) == -1 && !fnmatch(p, entry->d_name,0)) /* create long name */
snprintf(temp, FN_REFLEN, "%s/%s", path, entry->d_name);
if (lstat(temp, &st) == -1)
{
return 1; /* Error couldn't lstat file */
}
if (!S_ISDIR(st.st_mode) && !fnmatch(p, entry->d_name,0))
#else #else
if (!S_ISDIR(entry->d_type) && !fnmatch(p, entry->d_name,0)) if (!S_ISDIR(entry->d_type) && !fnmatch(p, entry->d_name,0))
#endif #endif
......
mysql-test/mysql_test_run_new.c
View file @ 5de67390
...@@ -1021,14 +1021,6 @@ void run_test(char *test) ...@@ -1021,14 +1021,6 @@ void run_test(char *test)
char err_file[FN_REFLEN]; char err_file[FN_REFLEN];
int err; int err;
arg_list_t al; arg_list_t al;
#ifdef __WIN__
/* Clean test database */
removef("%s/test/*.*", master_dir);
removef("%s/test/*.*", slave_dir);
removef("%s/mysqltest/*.*", master_dir);
removef("%s/mysqltest/*.*", slave_dir);
#endif
/* skip slave? */ /* skip slave? */
flag= skip_slave; flag= skip_slave;
skip_slave= (strncmp(test, "rpl", 3) != 0); skip_slave= (strncmp(test, "rpl", 3) != 0);
...@@ -1393,7 +1385,11 @@ void setup(char *file __attribute__((unused))) ...@@ -1393,7 +1385,11 @@ void setup(char *file __attribute__((unused)))
snprintf(client_key, FN_REFLEN, "%s/SSL/client-key.pem", base_dir); snprintf(client_key, FN_REFLEN, "%s/SSL/client-key.pem", base_dir);
/* setup files */ /* setup files */
#ifdef _DEBUG
snprintf(mysqld_file, FN_REFLEN, "%s/mysqld-debug.exe", bin_dir);
#else
snprintf(mysqld_file, FN_REFLEN, "%s/mysqld.exe", bin_dir); snprintf(mysqld_file, FN_REFLEN, "%s/mysqld.exe", bin_dir);
#endif
snprintf(mysqltest_file, FN_REFLEN, "%s/mysqltest.exe", bin_dir); snprintf(mysqltest_file, FN_REFLEN, "%s/mysqltest.exe", bin_dir);
snprintf(mysqladmin_file, FN_REFLEN, "%s/mysqladmin.exe", bin_dir); snprintf(mysqladmin_file, FN_REFLEN, "%s/mysqladmin.exe", bin_dir);
#else #else
...@@ -1494,6 +1490,13 @@ void setup(char *file __attribute__((unused))) ...@@ -1494,6 +1490,13 @@ void setup(char *file __attribute__((unused)))
snprintf(file_path, FN_REFLEN*2, snprintf(file_path, FN_REFLEN*2,
"CLIENT_BINDIR=%s", bin_dir); "CLIENT_BINDIR=%s", bin_dir);
_putenv(file_path); _putenv(file_path);
snprintf(file_path, FN_REFLEN*2,
"MYSQL_CLIENT_TEST=%s/tests/mysql_client_test --no-defaults --testcase "
"--user=root --port=%u --silent",
base_dir, master_port);
_putenv(file_path);
#else #else
{ {
static char env_MYSQL_TEST_DIR[FN_REFLEN*2]; static char env_MYSQL_TEST_DIR[FN_REFLEN*2];
...@@ -1506,6 +1509,7 @@ void setup(char *file __attribute__((unused))) ...@@ -1506,6 +1509,7 @@ void setup(char *file __attribute__((unused)))
static char env_MYSQL_FIX_SYSTEM_TABLES[FN_REFLEN*2]; static char env_MYSQL_FIX_SYSTEM_TABLES[FN_REFLEN*2];
static char env_NDB_TOOLS_DIR[FN_REFLEN*2]; static char env_NDB_TOOLS_DIR[FN_REFLEN*2];
static char env_CLIENT_BINDIR[FN_REFLEN*2]; static char env_CLIENT_BINDIR[FN_REFLEN*2];
static char env_MYSQL_CLIENT_TEST[FN_REFLEN*2];
snprintf(env_MYSQL_TEST_DIR,FN_REFLEN*2, snprintf(env_MYSQL_TEST_DIR,FN_REFLEN*2,
"MYSQL_TEST_DIR=%s",mysql_test_dir); "MYSQL_TEST_DIR=%s",mysql_test_dir);
...@@ -1552,6 +1556,13 @@ void setup(char *file __attribute__((unused))) ...@@ -1552,6 +1556,13 @@ void setup(char *file __attribute__((unused)))
snprintf(env_CLIENT_BINDIR, FN_REFLEN*2, snprintf(env_CLIENT_BINDIR, FN_REFLEN*2,
"CLIENT_BINDIR=%s", bin_dir); "CLIENT_BINDIR=%s", bin_dir);
putenv(env_CLIENT_BINDIR); putenv(env_CLIENT_BINDIR);
snprintf(env_MYSQL_CLIENT_TEST, FN_REFLEN*2,
"MYSQL_CLIENT_TEST=%s/tests/mysql_client_test --no-defaults --testcase "
"--user=root --socket=%s --port=%u --silent",
base_dir, master_socket, master_port);
putenv(env_MYSQL_CLIENT_TEST);
} }
#endif #endif
...@@ -1592,9 +1603,14 @@ int main(int argc, char **argv) ...@@ -1592,9 +1603,14 @@ int main(int argc, char **argv)
char **testes= 0; char **testes= 0;
int name_index; int name_index;
int index; int index;
char var_dir[FN_REFLEN];
/* setup */ /* setup */
setup(argv[0]); setup(argv[0]);
/* delete all file in var */
snprintf(var_dir,FN_REFLEN,"%s/var",mysql_test_dir);
del_tree(var_dir);
/* /*
The --ignore option is comma saperated list of test cases to skip and The --ignore option is comma saperated list of test cases to skip and
should be very first command line option to the test suite. should be very first command line option to the test suite.
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7