diff options
author | Michael Widenius <monty@askmonty.org> | 2010-08-25 01:44:50 +0300 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2010-08-25 01:44:50 +0300 |
commit | 58a75bb18b2a4080c8fae77024afed37f1be1314 (patch) | |
tree | 4d9d65f5747636d6dea9295e79464108df24a9a2 /mysql-test/Makefile.am | |
parent | 99b79db5dca6909456a40d859298ba3992b145da (diff) | |
parent | a82671178919afba86ddfdf2b64321eb9afff8e5 (diff) | |
download | mariadb-git-58a75bb18b2a4080c8fae77024afed37f1be1314.tar.gz |
Automerge with 5.1
Diffstat (limited to 'mysql-test/Makefile.am')
-rw-r--r-- | mysql-test/Makefile.am | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index 991c8116f1b..c74a042cab0 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -63,13 +63,14 @@ nobase_test_DATA = \ lib/My/SafeProcess.pm \ lib/My/File/Path.pm \ lib/My/SysInfo.pm \ + lib/My/Suite.pm \ lib/My/CoreDump.pm \ lib/My/SafeProcess/Base.pm \ lib/My/SafeProcess/safe_process.pl SUBDIRS = lib/My/SafeProcess -EXTRA_DIST = README \ +EXTRA_DIST = README README.suites \ $(test_SCRIPTS) \ $(nobase_test_DATA) @@ -101,7 +102,7 @@ TEST_DIRS = t r include std_data std_data/parts collections \ suite/ndb suite/ndb/t suite/ndb/r \ suite/rpl_ndb suite/rpl_ndb/t suite/rpl_ndb/r \ suite/parts suite/parts/t suite/parts/r suite/parts/inc \ - suite/pbxt/t suite/pbxt/r \ + suite/pbxt/t suite/pbxt/r suite/pbxt \ suite/innodb suite/innodb/t suite/innodb/r suite/innodb/include \ suite/vcol suite/vcol/t suite/vcol/r suite/vcol/inc \ suite/oqgraph suite/oqgraph/t suite/oqgraph/r suite/oqgraph/include \ |