Skip to content

Commit 9b6ac07

Browse files
author
kent/[email protected]/production.mysql.com
committed
Makefile.am:
 Add ChangeLog if it exists - Removed separate 'normal+rowrepl' test run, not needed any longer - Removed separate 'rpl' test run, included in main test run already - Renamed some test "comments", to use similar naming style - Limited one of the Cluster test runs to 'ndb' and 'rpl_ndb' suites - Reordered test runs, to be aligned with Windows test runs mysql.spec.sh: - No longer including the "Example" storage engine - Added to configure "--without-ENGINE" if not to compile engine as plugin
1 parent 5397f8c commit 9b6ac07

File tree

3 files changed

+35
-25
lines changed

3 files changed

+35
-25
lines changed

‎Docs/Makefile.am‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,24 @@ EXTRA_DIST = mysql.info INSTALL-BINARY @extra_docs@
1919
# automake only seems to take care of this automatically,
2020
# if we're building the info page from texi directly.
2121
install-data-hook: $(srcdir)/mysql.info
22-
$(mkinstalldirs) $(DESTDIR)$(infodir)
23-
$(INSTALL_DATA) $(srcdir)/mysql.info $(DESTDIR)$(infodir)
22+
if test `basename $(prefix)` = "mysql" ; then \
23+
$(mkinstalldirs) $(DESTDIR)$(prefix)/docs ; \
24+
$(INSTALL_DATA) $(srcdir)/mysql.info $(DESTDIR)$(prefix)/docs ; \
25+
test ! -f $(top_srcdir)/ChangeLog || $(INSTALL_DATA) $(top_srcdir)/ChangeLog $(DESTDIR)$(prefix)/docs ; \
26+
else \
27+
$(mkinstalldirs) $(DESTDIR)$(infodir) $(DESTDIR)$(pkgdatadir) ; \
28+
$(INSTALL_DATA) $(srcdir)/mysql.info $(DESTDIR)$(infodir) ; \
29+
test ! -f $(top_srcdir)/ChangeLog || $(INSTALL_DATA) $(top_srcdir)/ChangeLog $(DESTDIR)$(pkgdatadir) ; \
30+
fi
2431

2532
uninstall-local:
26-
@RM@ -f $(DESTDIR)$(infodir)/mysql.info
33+
if test `basename $(prefix)` = "mysql" ; then \
34+
@RM@ -f $(DESTDIR)$(prefix)/docs/mysql.info ; \
35+
@RM@ -f $(DESTDIR)$(prefix)/docs/ChangeLog ; \
36+
else \
37+
@RM@ -f $(DESTDIR)$(infodir)/mysql.info ; \
38+
@RM@ -f $(DESTDIR)$(pkgdatadir)/ChangeLog ; \
39+
fi
2740

2841
# Don't update the files from bitkeeper
2942
%::SCCS/s.%

‎Makefile.am‎

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -132,45 +132,40 @@ test-bt:
132132
-cd mysql-test ; MTR_BUILD_THREAD=auto \
133133
@PERL@ ./mysql-test-run.pl --comment=ps --force --timer \
134134
--skip-ndbcluster --ps-protocol
135-
-cd mysql-test ; MTR_BUILD_THREAD=auto \
136-
@PERL@ ./mysql-test-run.pl --comment=normal+rowrepl --force --timer \
137-
--skip-ndbcluster --mysqld=--binlog-format=row
138135
-if [ -e bin/ndbd -o -e storage/ndb/src/kernel/ndbd ] ; then \
139136
cd mysql-test ; \
140137
MTR_BUILD_THREAD=auto \
141-
@PERL@ ./mysql-test-run.pl --comment=ps+rowrepl+NDB --force --timer \
142-
--ps-protocol --mysqld=--binlog-format=row ; \
138+
@PERL@ ./mysql-test-run.pl --comment=ndb+rpl_ndb+ps --force --timer \
139+
--ps-protocol --mysqld=--binlog-format=row --suite=ndb,rpl_ndb ; \
143140
MTR_BUILD_THREAD=auto \
144-
@PERL@ ./mysql-test-run.pl --comment=NDB --force --timer \
141+
@PERL@ ./mysql-test-run.pl --comment=ndb --force --timer \
145142
--with-ndbcluster-only ; \
146143
else \
147144
echo "no program found for 'ndbcluster' tests - skipped testing" ; \
148145
fi
149-
-if [ -e bin/mysqltest_embedded -o -e libmysqld/examples/mysqltest_embedded ] ; then \
150-
cd mysql-test ; MTR_BUILD_THREAD=auto \
151-
@PERL@ ./mysql-test-run.pl --comment=embedded --force --timer \
152-
--embedded-server --skip-rpl --skip-ndbcluster ; \
153-
else \
154-
echo "no program found for 'embedded' tests - skipped testing" ; \
155-
fi
156146
-cd mysql-test ; MTR_BUILD_THREAD=auto \
157-
@PERL@ ./mysql-test-run.pl --force --comment=funcs1_ps --ps-protocol --suite=funcs_1
147+
@PERL@ ./mysql-test-run.pl --force --comment=funcs1+ps --ps-protocol --suite=funcs_1
158148
-cd mysql-test ; MTR_BUILD_THREAD=auto \
159149
@PERL@ ./mysql-test-run.pl --force --comment=funcs2 --suite=funcs_2
160-
-cd mysql-test ; MTR_BUILD_THREAD=auto \
161-
@PERL@ ./mysql-test-run.pl --force --comment=rpl --suite=rpl
162150
-cd mysql-test ; MTR_BUILD_THREAD=auto \
163151
@PERL@ ./mysql-test-run.pl --force --comment=partitions --suite=parts
152+
-cd mysql-test ; MTR_BUILD_THREAD=auto \
153+
@PERL@ ./mysql-test-run.pl --force --comment=stress --suite=stress
164154
-if [ -d mysql-test/suite/nist ] ; then \
165155
cd mysql-test ; MTR_BUILD_THREAD=auto \
166-
@PERL@ ./mysql-test-run.pl --comment=NIST+normal --force --suite=nist ; \
156+
@PERL@ ./mysql-test-run.pl --comment=nist --force --suite=nist ; \
167157
fi
168158
-if [ -d mysql-test/suite/nist ] ; then \
169159
cd mysql-test ; MTR_BUILD_THREAD=auto \
170-
@PERL@ ./mysql-test-run.pl --comment=NIST+ps --force --suite=nist --ps-protocol ; \
160+
@PERL@ ./mysql-test-run.pl --comment=nist+ps --force --suite=nist --ps-protocol ; \
161+
fi
162+
-if [ -e bin/mysqltest_embedded -o -e libmysqld/examples/mysqltest_embedded ] ; then \
163+
cd mysql-test ; MTR_BUILD_THREAD=auto \
164+
@PERL@ ./mysql-test-run.pl --comment=embedded --force --timer \
165+
--embedded-server --skip-rpl --skip-ndbcluster ; \
166+
else \
167+
echo "no program found for 'embedded' tests - skipped testing" ; \
171168
fi
172-
-cd mysql-test ; MTR_BUILD_THREAD=auto \
173-
@PERL@ ./mysql-test-run.pl --force --comment=stress --suite=stress
174169

175170
# Re-enable the "jp" suite when bug#28563 is fixed
176171
# -cd mysql-test ; MTR_BUILD_THREAD=auto \

‎support-files/mysql.spec.sh‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,6 @@ BuildMySQL "--enable-shared \
341341
%endif
342342
--with-archive-storage-engine \
343343
--with-csv-storage-engine \
344-
--with-example-storage-engine \
345344
--with-blackhole-storage-engine \
346345
%if %{FEDERATED_BUILD}
347346
--with-federated-storage-engine \
@@ -373,13 +372,16 @@ BuildMySQL "--enable-shared \
373372
--with-innodb \
374373
%if %{CLUSTER_BUILD}
375374
--with-ndbcluster \
375+
%else
376+
--without-ndbcluster \
376377
%endif
377378
--with-archive-storage-engine \
378379
--with-csv-storage-engine \
379-
--with-example-storage-engine \
380380
--with-blackhole-storage-engine \
381381
%if %{FEDERATED_BUILD}
382382
--with-federated-storage-engine \
383+
%else
384+
--without-federated-storage-engine \
383385
%endif
384386
--with-partition \
385387
--with-embedded-server \

0 commit comments

Comments
 (0)