summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormagnus@neptunus.(none) <>2004-07-15 09:28:18 +0200
committermagnus@neptunus.(none) <>2004-07-15 09:28:18 +0200
commite20c134da3bbcf079eb4e89fc9345efb549a6a09 (patch)
treef8743ccf3f0cf348b042ffd3986f842821787c23
parent66f9769ae3fe537eb2ade798a3b198a548e2c176 (diff)
downloadmariadb-git-e20c134da3bbcf079eb4e89fc9345efb549a6a09.tar.gz
Moved testScanPerf to ndb/test/ndbapi/ and added it to Makefile
-rw-r--r--ndb/test/ndbapi/Makefile.am2
-rw-r--r--ndb/test/ndbapi/testScanPerf.cpp (renamed from ndb/test/ndbapi/testScanPerf/testScanPerf.cpp)0
-rw-r--r--ndb/test/ndbapi/testScanPerf/Makefile9
3 files changed, 2 insertions, 9 deletions
diff --git a/ndb/test/ndbapi/Makefile.am b/ndb/test/ndbapi/Makefile.am
index 6776ba966c1..97d839fe58c 100644
--- a/ndb/test/ndbapi/Makefile.am
+++ b/ndb/test/ndbapi/Makefile.am
@@ -25,6 +25,7 @@ testOperations \
testRestartGci \
testScan \
testScanInterpreter \
+testScanPerf \
testSystemRestart \
testTimeout \
testTransactions \
@@ -59,6 +60,7 @@ testOperations_SOURCES = testOperations.cpp
testRestartGci_SOURCES = testRestartGci.cpp
testScan_SOURCES = testScan.cpp
testScanInterpreter_SOURCES = testScanInterpreter.cpp
+testScanPerf_SOURCES = testScanPerf.cpp
testSystemRestart_SOURCES = testSystemRestart.cpp
testTimeout_SOURCES = testTimeout.cpp
testTransactions_SOURCES = testTransactions.cpp
diff --git a/ndb/test/ndbapi/testScanPerf/testScanPerf.cpp b/ndb/test/ndbapi/testScanPerf.cpp
index 61af1ffb989..61af1ffb989 100644
--- a/ndb/test/ndbapi/testScanPerf/testScanPerf.cpp
+++ b/ndb/test/ndbapi/testScanPerf.cpp
diff --git a/ndb/test/ndbapi/testScanPerf/Makefile b/ndb/test/ndbapi/testScanPerf/Makefile
deleted file mode 100644
index fdf5980b385..00000000000
--- a/ndb/test/ndbapi/testScanPerf/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-include .defs.mk
-
-TYPE = ndbapitest
-
-BIN_TARGET = testScanPerf
-
-SOURCES = testScanPerf.cpp
-
-include $(NDB_TOP)/Epilogue.mk