sb118: configure OOO_JUNIT_JAR

5 files changed, 62 insertions, 0 deletions

diff --git a/configure b/configure
index 3359feaf14ea..0e214e8be5ab 100755
--- a/configure
+++ b/configure
@@ -649,6 +649,7 @@ INTRO_BITMAPS
 WITH_DICT
 WITH_POOR_HELP_LOCALIZATIONS
 WITH_LANG
+OOO_JUNIT_JAR
 ANT_LIB
 ANT_HOME
 ANT
@@ -1162,6 +1163,7 @@ with_gxx_include_path
 with_java
 enable_gcjaot
 with_ant_home
+with_junit
 with_perl_home
 with_cl_home
 with_mspdb_path
@@ -2240,6 +2242,12 @@ Optional Packages:
 
                           Usage: --with-ant-home=<absolute path to Ant home>
 
+  --with-junit            Specifies the JUnit 4 jar file to use for JUnit-based
+                          tests.  --without-junit disables those tests.  Not
+                          relevant in the --without-java case.
+
+                          Usage: --with-junit=<absolute path to JUnit 4 jar>
+
   --with-perl-home        If you have installed the Perl 5 Distribution, on your
                           system, please supply the path here.
                           Note that this is not the location of the Perl binary
@@ -3689,6 +3697,14 @@ if test "${with_ant_home+set}" = set; then
 fi
 
 
+# Check whether --with-junit was given.
+if test "${with_junit+set}" = set; then
+  withval=$with_junit;
+else
+  with_junit=yes
+fi
+
+
 # Check whether --with-perl-home was given.
 if test "${with_perl_home+set}" = set; then
   withval=$with_perl_home;
@@ -29288,6 +29304,26 @@ $as_echo "$as_me: error: no. Did you install ant-apache-regexp?" >&2;}
 fi
 rm -f conftest* core core.* *.core
 
+OOO_JUNIT_JAR=
+if test "$SOLAR_JAVA" != "" && test "$with_junit" != "no"; then
+    { $as_echo "$as_me:$LINENO: checking for JUnit 4" >&5
+$as_echo_n "checking for JUnit 4... " >&6; }
+    if test "$with_junit" == "yes"; then
+        OOO_JUNIT_JAR=/usr/share/java/junit4.jar
+    else
+        OOO_JUNIT_JAR=$with_junit
+    fi
+    if test -e "$OOO_JUNIT_JAR"; then
+        { $as_echo "$as_me:$LINENO: result: $OOO_JUNIT_JAR" >&5
+$as_echo "$OOO_JUNIT_JAR" >&6; }
+    else
+        { { $as_echo "$as_me:$LINENO: error: cannot find JUnit 4 jar at $OOO_JUNIT_JAR; please install one and/or specify its pathname as --with-junit=..." >&5
+$as_echo "$as_me: error: cannot find JUnit 4 jar at $OOO_JUNIT_JAR; please install one and/or specify its pathname as --with-junit=..." >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+fi
+
+
 { $as_echo "$as_me:$LINENO: checking which languages to be built" >&5
 $as_echo_n "checking which languages to be built... " >&6; }
 WITH_LANG="$with_lang"
diff --git a/configure.in b/configure.in
index 0cb45bf15a69..716b0beeb688 100644
--- a/configure.in
+++ b/configure.in
@@ -580,6 +580,13 @@ AC_ARG_WITH(ant-home,
  
                           Usage: --with-ant-home=<absolute path to Ant home>
 ],,)
+AC_ARG_WITH(junit,
+[  --with-junit            Specifies the JUnit 4 jar file to use for JUnit-based
+                          tests.  --without-junit disables those tests.  Not
+                          relevant in the --without-java case.
+
+                          Usage: --with-junit=<absolute path to JUnit 4 jar>
+],,with_junit=yes)
 AC_ARG_WITH(perl-home,
 [  --with-perl-home        If you have installed the Perl 5 Distribution, on your
                           system, please supply the path here.
@@ -6454,6 +6461,22 @@ EOF
 fi
 rm -f conftest* core core.* *.core
 
+OOO_JUNIT_JAR=
+if test "$SOLAR_JAVA" != "" && test "$with_junit" != "no"; then
+    AC_MSG_CHECKING([for JUnit 4])
+    if test "$with_junit" == "yes"; then
+        OOO_JUNIT_JAR=/usr/share/java/junit4.jar
+    else
+        OOO_JUNIT_JAR=$with_junit
+    fi
+    if test -e "$OOO_JUNIT_JAR"; then
+        AC_MSG_RESULT([$OOO_JUNIT_JAR])
+    else
+        AC_MSG_ERROR([cannot find JUnit 4 jar at $OOO_JUNIT_JAR; please install one and/or specify its pathname as --with-junit=...])
+    fi
+fi
+AC_SUBST(OOO_JUNIT_JAR)
+
 AC_MSG_CHECKING([which languages to be built])
 WITH_LANG="$with_lang"
 if test -z "$WITH_LANG"; then
diff --git a/set_soenv.in b/set_soenv.in
index 72302b4489a9..77c671ecb661 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1577,6 +1577,7 @@ ToFile( "ENABLE_MINIMIZER",   "@ENABLE_MINIMIZER@","e" );
 ToFile( "ENABLE_PRESENTER_SCREEN","@ENABLE_PRESENTER_SCREEN@","e" );
 ToFile( "ENABLE_REPORTBUILDER","@ENABLE_REPORTBUILDER@","e" );
 ToFile( "SYSTEM_JFREEREPORT","@SYSTEM_JFREEREPORT@","e" );
+ToFile( "OOO_JUNIT_JAR",     "@OOO_JUNIT_JAR@",    "e" );
 ToFile( "SAC_JAR",           "@SAC_JAR@",          "e" );
 ToFile( "LIBXML_JAR",        "@LIBXML_JAR@",       "e" );
 ToFile( "FLUTE_JAR",         "@FLUTE_JAR@",        "e" );
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index f3971755bee2..cb2501ca2d4e 100644
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
@@ -199,6 +199,7 @@ finish
 			BISON_HAIRY %SOLARROOT%$/btools$/bison.hairy
 			BISON_SIMPLE %SOLARROOT%$/btools$/bison.simple
 			DPKG %BUILD_TOOLS%$/dpkg
+            OOO_JUNIT_JAR %SOLARROOT%$/btools$/junit-4.8.1.jar
 			PATH .$:$cp(%SOLARENV%$/bin)$:$cp(%COMMON_BUILD_TOOLS%)$:$cp(%BUILD_TOOLS%$/dmake412)$:$cp(%BUILD_TOOLS%)$:$cp(%COMMON_ENV_TOOLS%)$:$cp(%ENV_TOOLS%)$:$cp(%COMPATH%$/bin)$:$cp(%JDKPATH%)$:$cp(%PATHEXTRA%)$:%PATH%
 			PATH_SEPERATOR $;
 			SOLARINC -I%SOLAR_STLPATH% -I%SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/external %SOLARINCLUDES%
diff --git a/solenv/config/ssolar.cmn b/solenv/config/ssolar.cmn
index f783527391f6..ab95e3419350 100644
--- a/solenv/config/ssolar.cmn
+++ b/solenv/config/ssolar.cmn
@@ -157,6 +157,7 @@ common
 		ODBCPATH
 		ODBCVER
 		OLD_CHAOS
+        OOO_JUNIT_JAR
         OOO_SHELL
 		PACKMS
 		PCLEAN_PATH