summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ndb/test/ndbapi/Makefile.am4
-rw-r--r--ndb/test/ndbapi/bank/old_dirs/bankCreator/Makefile8
-rw-r--r--ndb/test/ndbapi/bank/old_dirs/bankMakeGL/Makefile8
-rw-r--r--ndb/test/ndbapi/bank/old_dirs/bankSumAccounts/Makefile8
-rw-r--r--ndb/test/ndbapi/bank/old_dirs/bankTimer/Makefile8
-rw-r--r--ndb/test/ndbapi/bank/old_dirs/bankTransactionMaker/Makefile8
-rw-r--r--ndb/test/ndbapi/bank/old_dirs/bankValidateAllGLs/Makefile8
-rw-r--r--ndb/test/ndbapi/bank/old_dirs/src/Makefile7
-rw-r--r--ndb/test/ndbapi/bank/old_dirs/testBank/Makefile9
9 files changed, 2 insertions, 66 deletions
diff --git a/ndb/test/ndbapi/Makefile.am b/ndb/test/ndbapi/Makefile.am
index 52058c306fb..7b3648bdc45 100644
--- a/ndb/test/ndbapi/Makefile.am
+++ b/ndb/test/ndbapi/Makefile.am
@@ -58,8 +58,8 @@ testNodeRestart_SOURCES = testNodeRestart.cpp
testOIBasic_SOURCES = testOIBasic.cpp
testOperations_SOURCES = testOperations.cpp
testRestartGci_SOURCES = testRestartGci.cpp
-testScan_SOURCES = testScan.cpp
-testScanInterpreter_SOURCES = testScanInterpreter.cpp
+testScan_SOURCES = testScan.cpp ScanFunctions.hpp
+testScanInterpreter_SOURCES = testScanInterpreter.cpp ScanFilter.hpp ScanInterpretTest.hpp
testSystemRestart_SOURCES = testSystemRestart.cpp
testTimeout_SOURCES = testTimeout.cpp
testTransactions_SOURCES = testTransactions.cpp
diff --git a/ndb/test/ndbapi/bank/old_dirs/bankCreator/Makefile b/ndb/test/ndbapi/bank/old_dirs/bankCreator/Makefile
deleted file mode 100644
index d40103a8347..00000000000
--- a/ndb/test/ndbapi/bank/old_dirs/bankCreator/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-include .defs.mk
-
-TYPE = ndbapitest
-BIN_TARGET = bankCreator
-SOURCES = bankCreator.cpp
-BIN_TARGET_LIBS += bank
-
-include $(NDB_TOP)/Epilogue.mk
diff --git a/ndb/test/ndbapi/bank/old_dirs/bankMakeGL/Makefile b/ndb/test/ndbapi/bank/old_dirs/bankMakeGL/Makefile
deleted file mode 100644
index 16a092e885c..00000000000
--- a/ndb/test/ndbapi/bank/old_dirs/bankMakeGL/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-include .defs.mk
-
-TYPE = ndbapitest
-BIN_TARGET = bankMakeGL
-SOURCES = bankMakeGL.cpp
-BIN_TARGET_LIBS += bank
-
-include $(NDB_TOP)/Epilogue.mk
diff --git a/ndb/test/ndbapi/bank/old_dirs/bankSumAccounts/Makefile b/ndb/test/ndbapi/bank/old_dirs/bankSumAccounts/Makefile
deleted file mode 100644
index 34f1cc21bc6..00000000000
--- a/ndb/test/ndbapi/bank/old_dirs/bankSumAccounts/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-include .defs.mk
-
-TYPE = ndbapitest
-BIN_TARGET = bankSumAccounts
-SOURCES = bankSumAccounts.cpp
-BIN_TARGET_LIBS += bank
-
-include $(NDB_TOP)/Epilogue.mk
diff --git a/ndb/test/ndbapi/bank/old_dirs/bankTimer/Makefile b/ndb/test/ndbapi/bank/old_dirs/bankTimer/Makefile
deleted file mode 100644
index a2fcf703723..00000000000
--- a/ndb/test/ndbapi/bank/old_dirs/bankTimer/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-include .defs.mk
-
-TYPE = ndbapitest
-BIN_TARGET = bankTimer
-SOURCES = bankTimer.cpp
-BIN_TARGET_LIBS += bank
-
-include $(NDB_TOP)/Epilogue.mk
diff --git a/ndb/test/ndbapi/bank/old_dirs/bankTransactionMaker/Makefile b/ndb/test/ndbapi/bank/old_dirs/bankTransactionMaker/Makefile
deleted file mode 100644
index 2e482898476..00000000000
--- a/ndb/test/ndbapi/bank/old_dirs/bankTransactionMaker/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-include .defs.mk
-
-TYPE = ndbapitest
-BIN_TARGET = bankTransactionMaker
-SOURCES = bankTransactionMaker.cpp
-BIN_TARGET_LIBS += bank
-
-include $(NDB_TOP)/Epilogue.mk
diff --git a/ndb/test/ndbapi/bank/old_dirs/bankValidateAllGLs/Makefile b/ndb/test/ndbapi/bank/old_dirs/bankValidateAllGLs/Makefile
deleted file mode 100644
index 660b73fb830..00000000000
--- a/ndb/test/ndbapi/bank/old_dirs/bankValidateAllGLs/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-include .defs.mk
-
-TYPE = ndbapitest
-BIN_TARGET = bankValidateAllGLs
-SOURCES = bankValidateAllGLs.cpp
-BIN_TARGET_LIBS += bank
-
-include $(NDB_TOP)/Epilogue.mk
diff --git a/ndb/test/ndbapi/bank/old_dirs/src/Makefile b/ndb/test/ndbapi/bank/old_dirs/src/Makefile
deleted file mode 100644
index e0ab8e0e536..00000000000
--- a/ndb/test/ndbapi/bank/old_dirs/src/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-include .defs.mk
-
-TYPE = ndbapitest
-ARCHIVE_TARGET = bank
-SOURCES = Bank.cpp BankLoad.cpp
-
-include $(NDB_TOP)/Epilogue.mk
diff --git a/ndb/test/ndbapi/bank/old_dirs/testBank/Makefile b/ndb/test/ndbapi/bank/old_dirs/testBank/Makefile
deleted file mode 100644
index 382aaadad7c..00000000000
--- a/ndb/test/ndbapi/bank/old_dirs/testBank/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-include .defs.mk
-
-TYPE = ndbapitest
-
-BIN_TARGET = testBank
-BIN_TARGET_LIBS += bank
-SOURCES = testBank.cpp
-
-include $(NDB_TOP)/Epilogue.mk