Commit 4ed46633 authored by unknown's avatar unknown
Browse files

portability.h: 

  Corrected OpenServer ifdef test
Makefile.am:
  Added test-pl and test-force-pl targets


Makefile.am:
  Added test-pl and test-force-pl targets
server-tools/instance-manager/portability.h:
  Corrected OpenServer ifdef test
parent b262e643

Makefile.am

+19 −13
Original line number Diff line number Diff line
@@ -107,20 +107,26 @@ MYSQL_TEST_RUN_ARGS = --manager-port=$(MYSQL_TEST_MANAGER_PORT) \ 
				--master_port=$(MYSQL_TEST_MASTER_PORT) \

				--slave_port=$(MYSQL_TEST_SLAVE_PORT) \

				--ndbcluster_port=$(MYSQL_TEST_NDB_PORT)



test:

	cd mysql-test ; \

	./mysql-test-run \

		--manager-port=$(MYSQL_TEST_MANAGER_PORT) \

		--master_port=$(MYSQL_TEST_MASTER_PORT) \

		--slave_port=$(MYSQL_TEST_SLAVE_PORT) \

		--ndbcluster_port=$(MYSQL_TEST_NDB_PORT) && \

	./mysql-test-run --ps-protocol \

		--manager-port=$(MYSQL_TEST_MANAGER_PORT) \

		--master_port=$(MYSQL_TEST_MASTER_PORT) \

		--slave_port=$(MYSQL_TEST_SLAVE_PORT) \

		--ndbcluster_port=$(MYSQL_TEST_NDB_PORT)

	./mysql-test-run $(MYSQL_TEST_RUN_ARGS) && \

	./mysql-test-run $(MYSQL_TEST_RUN_ARGS) --ps-protocol



test-force:

	cd mysql-test ; \

	./mysql-test-run --force ;\

	./mysql-test-run --ps-protocol --force
 
	./mysql-test-run $(MYSQL_TEST_RUN_ARGS) --force ; \

	./mysql-test-run $(MYSQL_TEST_RUN_ARGS) --ps-protocol --force



test-pl:

	cd mysql-test ; \

	./mysql-test-run.pl $(MYSQL_TEST_RUN_ARGS) && \

	./mysql-test-run.pl $(MYSQL_TEST_RUN_ARGS) --ps-protocol



test-force-pl:

	cd mysql-test ; \

	./mysql-test-run.pl $(MYSQL_TEST_RUN_ARGS) --force ; \

	./mysql-test-run.pl $(MYSQL_TEST_RUN_ARGS) --ps-protocol --force



# Don't update the files from bitkeeper

%::SCCS/s.%

server-tools/instance-manager/portability.h

+1 −1
Original line number Diff line number Diff line 
#ifndef INCLUDES_MYSQL_INSTANCE_MANAGER_PORTABILITY_H

#define INCLUDES_MYSQL_INSTANCE_MANAGER_PORTABILITY_H



#if defined(__SCO_DS) && !defined(SHUT_RDWR)

#if defined(_SCO_DS) && !defined(SHUT_RDWR)

#define SHUT_RDWR 2

#endif