changeset 14620:a22701474f29

Replace SunMSCAPI shell test with java test and add @modules
author mchung
date Tue, 01 Dec 2015 09:09:26 -0800
parents 1bb6e0541cf8
children 9fdbe1e7defa
files test/sun/security/mscapi/IsSunMSCAPIAvailable.java test/sun/security/mscapi/IsSunMSCAPIAvailable.sh
diffstat 2 files changed, 6 insertions(+), 55 deletions(-) [+]
line wrap: on
line diff
--- a/test/sun/security/mscapi/IsSunMSCAPIAvailable.java	Tue Dec 01 09:08:40 2015 -0800
+++ b/test/sun/security/mscapi/IsSunMSCAPIAvailable.java	Tue Dec 01 09:09:26 2015 -0800
@@ -21,8 +21,12 @@
  * questions.
  */
 
-/**
- * @see IsSunMSCAPIAvailable.sh
+/*
+ * @test
+ * @bug 6318171 6931562
+ * @requires os.family == "windows"
+ * @modules jdk.crypto.mscapi/sun.security.mscapi
+ * @run main/othervm IsSunMSCAPIAvailable
  */
 
 import java.security.Provider;
--- a/test/sun/security/mscapi/IsSunMSCAPIAvailable.sh	Tue Dec 01 09:08:40 2015 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-
-# @test
-# @bug 6318171 6931562
-# @requires os.family == "windows"
-# @run shell IsSunMSCAPIAvailable.sh
-# @summary Basic test of the Microsoft CryptoAPI provider.
-
-OS=`uname -s`
-case "$OS" in
-    Windows* | CYGWIN* )
-
-    # 'uname -m' does not give us enough information -
-    #  should rely on $PROCESSOR_IDENTIFIER (as is done in Defs-windows.gmk),
-    #  but JTREG does not pass this env variable when executing a shell script.
-    #
-    #  execute test program - rely on it to exit if platform unsupported
-
-	${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d . ${TESTSRC}\\IsSunMSCAPIAvailable.java
-	${TESTJAVA}/bin/java ${TESTVMOPTS} IsSunMSCAPIAvailable
-	exit
-	;;
-
-    * )
-        echo "This test is not intended for '$OS' - passing test"
-        exit 0
-        ;;
-esac
-