From 355e4b490362ea11a8e914196ff9bda1a340cb62 Mon Sep 17 00:00:00 2001
From: Mike Romberg <mike-romberg@comcast.net>
Date: Thu, 2 Jun 2016 17:29:05 -0600
Subject: [PATCH] Add cases for tests without the -py3 flag even when PY3 is
 set.

---
 .../import_packages/split_wrapper/Makefile    |  3 ++-
 .../split_wrapper/builtin/pkg1/Makefile       |  6 +++--
 .../split_wrapper/builtin_nopy3/Makefile      | 18 +++++++++++++++
 .../split_wrapper/builtin_nopy3/pkg1/Makefile | 22 ++++++++++++++++++
 .../split_wrapper/builtin_nopy3/pkg1/README   |  0
 .../builtin_nopy3/pkg1/__init__.py            |  0
 .../split_wrapper/builtin_nopy3/pkg1/foo.i    | 10 ++++++++
 .../split_wrapper/builtin_nopy3/runme.py      |  3 +++
 .../builtin_split_nopy3/Makefile              | 23 +++++++++++++++++++
 .../split_wrapper/builtin_split_nopy3/foo.i   | 10 ++++++++
 .../builtin_split_nopy3/pkg1/README           |  0
 .../builtin_split_nopy3/pkg1/__init__.py      |  0
 .../builtin_split_nopy3/runme.py              |  3 +++
 .../split_wrapper/vanilla_nopy3/Makefile      | 18 +++++++++++++++
 .../split_wrapper/vanilla_nopy3/pkg1/Makefile | 19 +++++++++++++++
 .../split_wrapper/vanilla_nopy3/pkg1/README   |  0
 .../vanilla_nopy3/pkg1/__init__.py            |  0
 .../split_wrapper/vanilla_nopy3/pkg1/foo.i    | 10 ++++++++
 .../split_wrapper/vanilla_nopy3/runme.py      |  3 +++
 .../vanilla_split_nopy3/Makefile              | 23 +++++++++++++++++++
 .../split_wrapper/vanilla_split_nopy3/foo.i   | 10 ++++++++
 .../vanilla_split_nopy3/pkg1/README           |  0
 .../vanilla_split_nopy3/pkg1/__init__.py      |  0
 .../vanilla_split_nopy3/runme.py              |  3 +++
 24 files changed, 181 insertions(+), 3 deletions(-)
 create mode 100644 Examples/python/import_packages/split_wrapper/builtin_nopy3/Makefile
 create mode 100644 Examples/python/import_packages/split_wrapper/builtin_nopy3/pkg1/Makefile
 create mode 100644 Examples/python/import_packages/split_wrapper/builtin_nopy3/pkg1/README
 create mode 100644 Examples/python/import_packages/split_wrapper/builtin_nopy3/pkg1/__init__.py
 create mode 100644 Examples/python/import_packages/split_wrapper/builtin_nopy3/pkg1/foo.i
 create mode 100644 Examples/python/import_packages/split_wrapper/builtin_nopy3/runme.py
 create mode 100644 Examples/python/import_packages/split_wrapper/builtin_split_nopy3/Makefile
 create mode 100644 Examples/python/import_packages/split_wrapper/builtin_split_nopy3/foo.i
 create mode 100644 Examples/python/import_packages/split_wrapper/builtin_split_nopy3/pkg1/README
 create mode 100644 Examples/python/import_packages/split_wrapper/builtin_split_nopy3/pkg1/__init__.py
 create mode 100644 Examples/python/import_packages/split_wrapper/builtin_split_nopy3/runme.py
 create mode 100644 Examples/python/import_packages/split_wrapper/vanilla_nopy3/Makefile
 create mode 100644 Examples/python/import_packages/split_wrapper/vanilla_nopy3/pkg1/Makefile
 create mode 100644 Examples/python/import_packages/split_wrapper/vanilla_nopy3/pkg1/README
 create mode 100644 Examples/python/import_packages/split_wrapper/vanilla_nopy3/pkg1/__init__.py
 create mode 100644 Examples/python/import_packages/split_wrapper/vanilla_nopy3/pkg1/foo.i
 create mode 100644 Examples/python/import_packages/split_wrapper/vanilla_nopy3/runme.py
 create mode 100644 Examples/python/import_packages/split_wrapper/vanilla_split_nopy3/Makefile
 create mode 100644 Examples/python/import_packages/split_wrapper/vanilla_split_nopy3/foo.i
 create mode 100644 Examples/python/import_packages/split_wrapper/vanilla_split_nopy3/pkg1/README
 create mode 100644 Examples/python/import_packages/split_wrapper/vanilla_split_nopy3/pkg1/__init__.py
 create mode 100644 Examples/python/import_packages/split_wrapper/vanilla_split_nopy3/runme.py

diff --git a/Examples/python/import_packages/split_wrapper/Makefile b/Examples/python/import_packages/split_wrapper/Makefile
index 09d5c4cf2..37674108a 100644
--- a/Examples/python/import_packages/split_wrapper/Makefile
+++ b/Examples/python/import_packages/split_wrapper/Makefile
@@ -1,7 +1,8 @@
 TOP        = ../../..
 LIBS       =
 
-subdirs = builtin vanilla builtin_split vanilla_split
+subdirs = builtin vanilla builtin_split vanilla_split \
+          builtin_nopy3 vanilla_nopy3 builtin_split_nopy3 vanilla_split_nopy3
 
 check: build
 	for s in $(subdirs); do \
diff --git a/Examples/python/import_packages/split_wrapper/builtin/pkg1/Makefile b/Examples/python/import_packages/split_wrapper/builtin/pkg1/Makefile
index 02692dfab..da9240e6f 100644
--- a/Examples/python/import_packages/split_wrapper/builtin/pkg1/Makefile
+++ b/Examples/python/import_packages/split_wrapper/builtin/pkg1/Makefile
@@ -7,12 +7,14 @@ LIBS       =
 build:
 	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' \
 	SWIG_LIB_DIR='$(SWIG_LIB_DIR)' SWIGEXE='$(SWIGEXE)' \
-	SWIGOPT='$(SWIGOPT)' LIBS='$(LIBS)' TARGET='foo' INTERFACE='foo.i' python_cpp
+	SWIGOPT='$(SWIGOPT)' LIBS='$(LIBS)' TARGET='foo' \
+        INTERFACE='foo.i' python_cpp
 
 static:
 	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' \
 	SWIG_LIB_DIR='$(SWIG_LIB_DIR)' SWIGEXE='$(SWIGEXE)' \
-	SWIGOPT='$(SWIGOPT)' LIBS='$(LIBS)' TARGET='foo' INTERFACE='foo.i' python_cpp_static
+	SWIGOPT='$(SWIGOPT)' LIBS='$(LIBS)' TARGET='foo' \
+        INTERFACE='foo.i' python_cpp_static
 
 clean:
 	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' TARGET='foo' python_clean
diff --git a/Examples/python/import_packages/split_wrapper/builtin_nopy3/Makefile b/Examples/python/import_packages/split_wrapper/builtin_nopy3/Makefile
new file mode 100644
index 000000000..b679d60a0
--- /dev/null
+++ b/Examples/python/import_packages/split_wrapper/builtin_nopy3/Makefile
@@ -0,0 +1,18 @@
+TOP        = ../../../..
+SWIGEXE    = $(TOP)/../swig
+SWIG_LIB_DIR = $(TOP)/../$(TOP_BUILDDIR_TO_TOP_SRCDIR)Lib
+SWIGOPT    =
+LIBS       =
+
+check: build
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' python_run
+
+build:
+	cd pkg1 && $(MAKE) build
+
+static:
+	cd pkg1 && $(MAKE) static
+
+clean:
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' TARGET='foo' python_clean
+	cd pkg1 && $(MAKE) -f $(TOP)/../Makefile SRCDIR='$(SRCDIR)' TARGET='foo' python_clean
diff --git a/Examples/python/import_packages/split_wrapper/builtin_nopy3/pkg1/Makefile b/Examples/python/import_packages/split_wrapper/builtin_nopy3/pkg1/Makefile
new file mode 100644
index 000000000..a6672eb4c
--- /dev/null
+++ b/Examples/python/import_packages/split_wrapper/builtin_nopy3/pkg1/Makefile
@@ -0,0 +1,22 @@
+TOP        = ../../../../..
+SWIGEXE    = $(TOP)/../swig
+SWIG_LIB_DIR = $(TOP)/../$(TOP_BUILDDIR_TO_TOP_SRCDIR)Lib
+SWIGOPT    = -builtin
+LIBS       =
+
+build:
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' \
+        SWIGPYTHON='$$(SWIG) -python' \
+	SWIG_LIB_DIR='$(SWIG_LIB_DIR)' SWIGEXE='$(SWIGEXE)' \
+	SWIGOPT='$(SWIGOPT)' LIBS='$(LIBS)' TARGET='foo' \
+        INTERFACE='foo.i' python_cpp
+
+static:
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' \
+	SWIG_LIB_DIR='$(SWIG_LIB_DIR)' SWIGEXE='$(SWIGEXE)' \
+	SWIGOPT='$(SWIGOPT)' LIBS='$(LIBS)' TARGET='foo' \
+        INTERFACE='foo.i' python_cpp_static
+
+clean:
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' TARGET='foo' python_clean
+
diff --git a/Examples/python/import_packages/split_wrapper/builtin_nopy3/pkg1/README b/Examples/python/import_packages/split_wrapper/builtin_nopy3/pkg1/README
new file mode 100644
index 000000000..e69de29bb
diff --git a/Examples/python/import_packages/split_wrapper/builtin_nopy3/pkg1/__init__.py b/Examples/python/import_packages/split_wrapper/builtin_nopy3/pkg1/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/Examples/python/import_packages/split_wrapper/builtin_nopy3/pkg1/foo.i b/Examples/python/import_packages/split_wrapper/builtin_nopy3/pkg1/foo.i
new file mode 100644
index 000000000..00df2d009
--- /dev/null
+++ b/Examples/python/import_packages/split_wrapper/builtin_nopy3/pkg1/foo.i
@@ -0,0 +1,10 @@
+%module(package="pkg1") foo
+%{
+static unsigned count(void)
+    {
+    return 3;
+    }
+%}
+
+unsigned count(void);
+
diff --git a/Examples/python/import_packages/split_wrapper/builtin_nopy3/runme.py b/Examples/python/import_packages/split_wrapper/builtin_nopy3/runme.py
new file mode 100644
index 000000000..8a6055bf1
--- /dev/null
+++ b/Examples/python/import_packages/split_wrapper/builtin_nopy3/runme.py
@@ -0,0 +1,3 @@
+import pkg1.foo
+
+assert(pkg1.foo.count() == 3)
diff --git a/Examples/python/import_packages/split_wrapper/builtin_split_nopy3/Makefile b/Examples/python/import_packages/split_wrapper/builtin_split_nopy3/Makefile
new file mode 100644
index 000000000..9b1334c85
--- /dev/null
+++ b/Examples/python/import_packages/split_wrapper/builtin_split_nopy3/Makefile
@@ -0,0 +1,23 @@
+TOP        = ../../../..
+SWIGEXE    = $(TOP)/../swig
+SWIG_LIB_DIR = $(TOP)/../$(TOP_BUILDDIR_TO_TOP_SRCDIR)Lib
+SWIGOPT    = -builtin -outdir pkg1
+LIBS       =
+
+check: build
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' python_run
+
+build:
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' \
+        SWIGPYTHON='$$(SWIG) -python' \
+	SWIG_LIB_DIR='$(SWIG_LIB_DIR)' SWIGEXE='$(SWIGEXE)' \
+	SWIGOPT='$(SWIGOPT)' LIBS='$(LIBS)' TARGET='foo' INTERFACE='foo.i' python_cpp
+
+static:
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' \
+	SWIG_LIB_DIR='$(SWIG_LIB_DIR)' SWIGEXE='$(SWIGEXE)' \
+	SWIGOPT='$(SWIGOPT)' LIBS='$(LIBS)' TARGET='foo' INTERFACE='foo.i' python_cpp_static
+
+clean:
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' TARGET='foo' python_clean
+	cd pkg1 && $(MAKE) -f $(TOP)/../Makefile SRCDIR='$(SRCDIR)' TARGET='foo' python_clean
diff --git a/Examples/python/import_packages/split_wrapper/builtin_split_nopy3/foo.i b/Examples/python/import_packages/split_wrapper/builtin_split_nopy3/foo.i
new file mode 100644
index 000000000..00df2d009
--- /dev/null
+++ b/Examples/python/import_packages/split_wrapper/builtin_split_nopy3/foo.i
@@ -0,0 +1,10 @@
+%module(package="pkg1") foo
+%{
+static unsigned count(void)
+    {
+    return 3;
+    }
+%}
+
+unsigned count(void);
+
diff --git a/Examples/python/import_packages/split_wrapper/builtin_split_nopy3/pkg1/README b/Examples/python/import_packages/split_wrapper/builtin_split_nopy3/pkg1/README
new file mode 100644
index 000000000..e69de29bb
diff --git a/Examples/python/import_packages/split_wrapper/builtin_split_nopy3/pkg1/__init__.py b/Examples/python/import_packages/split_wrapper/builtin_split_nopy3/pkg1/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/Examples/python/import_packages/split_wrapper/builtin_split_nopy3/runme.py b/Examples/python/import_packages/split_wrapper/builtin_split_nopy3/runme.py
new file mode 100644
index 000000000..8a6055bf1
--- /dev/null
+++ b/Examples/python/import_packages/split_wrapper/builtin_split_nopy3/runme.py
@@ -0,0 +1,3 @@
+import pkg1.foo
+
+assert(pkg1.foo.count() == 3)
diff --git a/Examples/python/import_packages/split_wrapper/vanilla_nopy3/Makefile b/Examples/python/import_packages/split_wrapper/vanilla_nopy3/Makefile
new file mode 100644
index 000000000..b679d60a0
--- /dev/null
+++ b/Examples/python/import_packages/split_wrapper/vanilla_nopy3/Makefile
@@ -0,0 +1,18 @@
+TOP        = ../../../..
+SWIGEXE    = $(TOP)/../swig
+SWIG_LIB_DIR = $(TOP)/../$(TOP_BUILDDIR_TO_TOP_SRCDIR)Lib
+SWIGOPT    =
+LIBS       =
+
+check: build
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' python_run
+
+build:
+	cd pkg1 && $(MAKE) build
+
+static:
+	cd pkg1 && $(MAKE) static
+
+clean:
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' TARGET='foo' python_clean
+	cd pkg1 && $(MAKE) -f $(TOP)/../Makefile SRCDIR='$(SRCDIR)' TARGET='foo' python_clean
diff --git a/Examples/python/import_packages/split_wrapper/vanilla_nopy3/pkg1/Makefile b/Examples/python/import_packages/split_wrapper/vanilla_nopy3/pkg1/Makefile
new file mode 100644
index 000000000..338a41725
--- /dev/null
+++ b/Examples/python/import_packages/split_wrapper/vanilla_nopy3/pkg1/Makefile
@@ -0,0 +1,19 @@
+TOP        = ../../../../..
+SWIGEXE    = $(TOP)/../swig
+SWIG_LIB_DIR = $(TOP)/../$(TOP_BUILDDIR_TO_TOP_SRCDIR)Lib
+SWIGOPT    =
+LIBS       =
+
+build:
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' \
+        SWIGPYTHON='$$(SWIG) -python' \
+	SWIG_LIB_DIR='$(SWIG_LIB_DIR)' SWIGEXE='$(SWIGEXE)' \
+	SWIGOPT='$(SWIGOPT)' LIBS='$(LIBS)' TARGET='foo' INTERFACE='foo.i' python_cpp
+
+static:
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' \
+	SWIG_LIB_DIR='$(SWIG_LIB_DIR)' SWIGEXE='$(SWIGEXE)' \
+	SWIGOPT='$(SWIGOPT)' LIBS='$(LIBS)' TARGET='foo' INTERFACE='foo.i' python_cpp_static
+
+clean:
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' TARGET='foo' python_clean
diff --git a/Examples/python/import_packages/split_wrapper/vanilla_nopy3/pkg1/README b/Examples/python/import_packages/split_wrapper/vanilla_nopy3/pkg1/README
new file mode 100644
index 000000000..e69de29bb
diff --git a/Examples/python/import_packages/split_wrapper/vanilla_nopy3/pkg1/__init__.py b/Examples/python/import_packages/split_wrapper/vanilla_nopy3/pkg1/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/Examples/python/import_packages/split_wrapper/vanilla_nopy3/pkg1/foo.i b/Examples/python/import_packages/split_wrapper/vanilla_nopy3/pkg1/foo.i
new file mode 100644
index 000000000..00df2d009
--- /dev/null
+++ b/Examples/python/import_packages/split_wrapper/vanilla_nopy3/pkg1/foo.i
@@ -0,0 +1,10 @@
+%module(package="pkg1") foo
+%{
+static unsigned count(void)
+    {
+    return 3;
+    }
+%}
+
+unsigned count(void);
+
diff --git a/Examples/python/import_packages/split_wrapper/vanilla_nopy3/runme.py b/Examples/python/import_packages/split_wrapper/vanilla_nopy3/runme.py
new file mode 100644
index 000000000..8a6055bf1
--- /dev/null
+++ b/Examples/python/import_packages/split_wrapper/vanilla_nopy3/runme.py
@@ -0,0 +1,3 @@
+import pkg1.foo
+
+assert(pkg1.foo.count() == 3)
diff --git a/Examples/python/import_packages/split_wrapper/vanilla_split_nopy3/Makefile b/Examples/python/import_packages/split_wrapper/vanilla_split_nopy3/Makefile
new file mode 100644
index 000000000..f9a0e7808
--- /dev/null
+++ b/Examples/python/import_packages/split_wrapper/vanilla_split_nopy3/Makefile
@@ -0,0 +1,23 @@
+TOP        = ../../../..
+SWIGEXE    = $(TOP)/../swig
+SWIG_LIB_DIR = $(TOP)/../$(TOP_BUILDDIR_TO_TOP_SRCDIR)Lib
+SWIGOPT    = -outdir pkg1
+LIBS       =
+
+check: build
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' python_run
+
+build:
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' \
+        SWIGPYTHON='$$(SWIG) -python' \
+	SWIG_LIB_DIR='$(SWIG_LIB_DIR)' SWIGEXE='$(SWIGEXE)' \
+	SWIGOPT='$(SWIGOPT)' LIBS='$(LIBS)' TARGET='foo' INTERFACE='foo.i' python_cpp
+
+static:
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' \
+	SWIG_LIB_DIR='$(SWIG_LIB_DIR)' SWIGEXE='$(SWIGEXE)' \
+	SWIGOPT='$(SWIGOPT)' LIBS='$(LIBS)' TARGET='foo' INTERFACE='foo.i' python_cpp_static
+
+clean:
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' TARGET='foo' python_clean
+	cd pkg1 && $(MAKE) -f $(TOP)/../Makefile SRCDIR='$(SRCDIR)' TARGET='foo' python_clean
diff --git a/Examples/python/import_packages/split_wrapper/vanilla_split_nopy3/foo.i b/Examples/python/import_packages/split_wrapper/vanilla_split_nopy3/foo.i
new file mode 100644
index 000000000..00df2d009
--- /dev/null
+++ b/Examples/python/import_packages/split_wrapper/vanilla_split_nopy3/foo.i
@@ -0,0 +1,10 @@
+%module(package="pkg1") foo
+%{
+static unsigned count(void)
+    {
+    return 3;
+    }
+%}
+
+unsigned count(void);
+
diff --git a/Examples/python/import_packages/split_wrapper/vanilla_split_nopy3/pkg1/README b/Examples/python/import_packages/split_wrapper/vanilla_split_nopy3/pkg1/README
new file mode 100644
index 000000000..e69de29bb
diff --git a/Examples/python/import_packages/split_wrapper/vanilla_split_nopy3/pkg1/__init__.py b/Examples/python/import_packages/split_wrapper/vanilla_split_nopy3/pkg1/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/Examples/python/import_packages/split_wrapper/vanilla_split_nopy3/runme.py b/Examples/python/import_packages/split_wrapper/vanilla_split_nopy3/runme.py
new file mode 100644
index 000000000..8a6055bf1
--- /dev/null
+++ b/Examples/python/import_packages/split_wrapper/vanilla_split_nopy3/runme.py
@@ -0,0 +1,3 @@
+import pkg1.foo
+
+assert(pkg1.foo.count() == 3)