Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
0b60b7d5
Commit
0b60b7d5
authored
Nov 13, 2006
by
msvensson@neptunus.(none)
Browse files
Options
Browse Files
Download
Plain Diff
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
parents
f105e0ec
e09df84a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
22 deletions
+16
-22
Makefile.am
Makefile.am
+3
-15
mysql-test/Makefile.am
mysql-test/Makefile.am
+13
-7
mysql-test/mysql-test-run-shell.sh
mysql-test/mysql-test-run-shell.sh
+0
-0
No files found.
Makefile.am
View file @
0b60b7d5
...
...
@@ -124,22 +124,10 @@ test-force:
./mysql-test-run
--force
&&
\
./mysql-test-run
--ps-protocol
--force
# We are testing a new Perl version of the test script
test-pl
:
test-force-mem
:
cd
mysql-test
;
\
./mysql-test-run
.pl
&&
\
./mysql-test-run
.pl
--ps-protocol
./mysql-test-run
--force
--mem
&&
\
./mysql-test-run
--ps-protocol
--force
--mem
test-force-pl
:
cd
mysql-test
;
\
./mysql-test-run.pl
--force
&&
\
./mysql-test-run.pl
--ps-protocol
--force
test-force-pl-mem
:
cd
mysql-test
;
\
./mysql-test-run.pl
--force
--mem
&&
\
./mysql-test-run.pl
--ps-protocol
--force
--mem
# Don't update the files from bitkeeper
%
::
SCCS/s.%
mysql-test/Makefile.am
View file @
0b60b7d5
...
...
@@ -33,19 +33,20 @@ endif
benchdir_root
=
$(prefix)
testdir
=
$(benchdir_root)
/mysql-test
EXTRA_SCRIPTS
=
mysql-test-run.sh install_test_db.sh valgrind.supp
$(PRESCRIPTS)
EXTRA_DIST
=
$(EXTRA_SCRIPTS)
GENSCRIPTS
=
mysql-test-run install_test_db mtr
EXTRA_DIST
=
$(EXTRA_SCRIPTS)
GENSCRIPTS
=
mysql-test-run
-shell mysql-test-run
install_test_db mtr
PRESCRIPTS
=
mysql-test-run.pl
test_SCRIPTS
=
$(GENSCRIPTS)
$(PRESCRIPTS)
test_DATA
=
std_data/client-key.pem std_data/client-cert.pem std_data/cacert.pem
\
std_data/server-cert.pem std_data/server-key.pem
test_DATA
=
std_data/client-key.pem
\
std_data/client-cert.pem
\
std_data/cacert.pem
\
std_data/server-cert.pem
\
std_data/server-key.pem
CLEANFILES
=
$(GENSCRIPTS)
$(test_DATA)
INCLUDES
=
-I
$(top_builddir)
/include
-I
$(top_srcdir)
/include
-I
..
EXTRA_PROGRAMS
=
mysql_test_run_new
noinst_HEADERS
=
my_manage.h
mysql_test_run_new_SOURCES
=
mysql_test_run_new.c my_manage.c my_create_tables.c
noinst_HEADERS
=
my_manage.h
dist-hook
:
mkdir
-p
$(distdir)
/t
$(distdir)
/r
$(distdir)
/include
\
...
...
@@ -117,6 +118,11 @@ mtr:
$(RM)
-f
mtr
$(LN_S)
mysql-test-run.pl mtr
# mysql-test-run - a shortcut for executing mysql-test-run.pl
mysql-test-run
:
$(RM)
-f
mysql-test-run
$(LN_S)
mysql-test-run.pl mysql-test-run
SUFFIXES
=
.sh
.sh
:
...
...
mysql-test/mysql-test-run.sh
→
mysql-test/mysql-test-run
-shell
.sh
View file @
0b60b7d5
File moved
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment