Changeset 1469

Timestamp:

02/08/07 12:00:02 (2 years ago)

Author:

dsugar

Message:

Updates based on relocation of stuff with the merge back into trunk

Files:

• trunk/compilerbuild.xml (modified) (3 diffs)
• trunk/framework-plugin/src/com/tresys/framework/compiler/Compiler.java (modified) (4 diffs)
• trunk/test/test0001/test.sh (modified) (1 diff)
• trunk/test/test0002/test.sh (modified) (1 diff)
• trunk/test/test0003/test.sh (modified) (1 diff)
• trunk/test/test0004/test.sh (modified) (1 diff)
• trunk/test/test0005/test.sh (modified) (1 diff)
• trunk/test/test0006/test.sh (modified) (1 diff)
• trunk/test/test0007/test.sh (modified) (1 diff)
• trunk/test/test0008/test.fsys (added)
• trunk/test/test0008/test.sh (modified) (1 diff)
• trunk/test/test0009/test.sh (modified) (1 diff)
• trunk/test/test0010/test.sh (modified) (1 diff)
• trunk/test/test0011/test.sh (modified) (1 diff)
• trunk/test/test0012/test.sh (modified) (1 diff)
• trunk/test/test0013/test.sh (modified) (1 diff)
• trunk/test/test0014/test.sh (modified) (1 diff)
• trunk/test/test0015/test.sh (modified) (1 diff)
• trunk/test/test0016/test.sh (modified) (1 diff)
• trunk/test/test0017/test.sh (modified) (1 diff)
• trunk/test/test0018/test.sh (modified) (1 diff)
• trunk/test/test0019/test.sh (modified) (1 diff)
• trunk/test/test0020/test.sh (modified) (1 diff)
• trunk/test/test0021/test.sh (modified) (1 diff)
• trunk/test/test0022/test.sh (modified) (1 diff)
• trunk/test/test0023/test.sh (modified) (1 diff)
• trunk/test/test0024/test.sh (modified) (1 diff)
• trunk/test/test0025/test.sh (modified) (1 diff)
• trunk/test/test0026/test.sh (modified) (1 diff)
• trunk/test/test0027/test.sh (modified) (1 diff)
• trunk/test/test0028/test.sh (modified) (1 diff)
• trunk/test/test0029/test.sh (modified) (1 diff)
• trunk/test/test0030/test.sh (modified) (1 diff)
• trunk/test/test0031/test.sh (modified) (1 diff)
• trunk/test/test0032/test.sh (modified) (1 diff)
• trunk/test/test0033/test.sh (modified) (1 diff)
• trunk/test/test0034/test.sh (modified) (1 diff)
• trunk/test/test0035/test.sh (modified) (1 diff)
• trunk/test/test0036/test.sh (modified) (1 diff)
• trunk/test/test0037/test.sh (modified) (1 diff)
• trunk/test/test0038/test.sh (modified) (1 diff)
• trunk/test/test0039/test.sh (modified) (1 diff)
• trunk/test/test0040/test.sh (modified) (1 diff)
• trunk/test/test0041/test.fsys (added)
• trunk/test/test0041/test.sh (modified) (1 diff)
• trunk/test/test0042/test.sh (modified) (1 diff)
• trunk/test/test0043/test.sh (modified) (1 diff)
• trunk/test/test0044/test.sh (modified) (1 diff)
• trunk/test/test0045/test.sh (modified) (1 diff)
• trunk/test/test0046/test.sh (modified) (1 diff)
• trunk/test/test0047/test.sh (modified) (1 diff)
• trunk/test/test0048/test.sh (modified) (1 diff)
• trunk/test/test0049/test.sh (modified) (1 diff)
• trunk/test/test0050/test.sh (modified) (1 diff)
• trunk/test/test0051/test.sh (modified) (1 diff)
• trunk/test/test0052/test.sh (modified) (1 diff)
• trunk/test/test0053/test.sh (modified) (1 diff)
• trunk/test/test0054/test.sh (modified) (1 diff)
• trunk/test/test0055/test.sh (modified) (1 diff)
• trunk/test/test0056/test.sh (modified) (1 diff)
• trunk/test/test0057/test.sh (modified) (1 diff)
• trunk/test/test0058/test.sh (modified) (1 diff)
• trunk/test/test0059/test.sh (modified) (1 diff)
• trunk/test/test0060/test.sh (modified) (1 diff)
• trunk/test/test0061/test.sh (modified) (1 diff)
• trunk/test/test0062/test.sh (modified) (1 diff)
• trunk/test/test0063/test.sh (modified) (1 diff)
• trunk/test/test0064/test.sh (modified) (1 diff)
• trunk/test/test0065/test.sh (modified) (1 diff)
• trunk/test/test0066/test.sh (modified) (1 diff)
• trunk/test/test0067/test.sh (modified) (1 diff)
• trunk/test/test0068/test.sh (modified) (1 diff)
• trunk/test/test0069/test.sh (modified) (1 diff)
• trunk/test/test0070/test.sh (modified) (1 diff)
• trunk/test/test0071/test.sh (modified) (1 diff)
• trunk/test/test0072/test.sh (modified) (1 diff)
• trunk/test/test0073/test.sh (modified) (1 diff)
• trunk/test/test0074/test.sh (modified) (1 diff)
• trunk/test/test0075/test.sh (modified) (1 diff)
• trunk/test/test0076/test.sh (modified) (1 diff)
• trunk/test/test0077/test.sh (modified) (1 diff)
• trunk/test/test0078/test.sh (modified) (1 diff)
• trunk/test/test0079/test.sh (modified) (1 diff)
• trunk/testall.sh (modified) (2 diffs)

trunk/compilerbuild.xml

@@ -17 +17 @@
-        <property name="javacc_ext" value=".jj" />
-
-branches/frameworkchanges
+trunk/slide-plugin
-
-        <!-- dictionary source -->
@@ -42 +42 @@
-        <property name="pkg_path" value="com/tresys/framework/compiler" />
-        <property name="pkg_name" value="com.tresys.framework.compiler" />
-
+framework-plugin/
-        <property name="build" value="build"/>
-        <property name="testdir" value="test" />
@@ -94 +94 @@
--->
-                
-                <!-- DJS - change URL to trunk when changes merged in for SLIDE -->
-                <exec dir="${utilitybuild}" executable="svn">
-                        <arg line="export --force ${svnlocation}/utility/policyxmlparser" />

trunk/framework-plugin/src/com/tresys/framework/compiler/Compiler.java

@@ -49 +49 @@
-        static String ifFilename = null;
-
+        static String libPath = System.getProperty("user.dir") + "/libselinuxjava/libselinuxjava.so";
+        
-        // verbose output and warning default values
-        static boolean debug = false;
-
-        static {
-                System.load(System.getProperty("user.dir")
-                        + "/libselinuxjava/libselinuxjava.so");
-        }
-
-        private static void getOpt(String[] args) {
@@ -128 +125 @@
-                                if(x < args.length) {
-                                        fcOutputFilename = args[x];
+                                } else {
+                                        printUsage();
+                                        System.exit(1);
+                                }
+                        } else if (args[x].equals("-lib")) {
+                                x++;
+                                if (x < args.length) {
+                                        libPath = args[x];
-                                } else {
-                                        printUsage();
@@ -226 +231 @@
-                        .println("  -if <interface file> specify interface file for linkage to reference policy and exposing an external API (defaults to stdout if not specified)");
-                System.out.println("\nA dictionary file must be specified.");
+                System.out.println ("  -lib <libselinuxjava.so> specify path to libselinuxjava.so library to be loaded");
-
-        }
@@ -249 +255 @@
-                getOpt(args);
-
+                // load libselinuxjava.so 
+                if (debug)
+                        System.out.println ("path for libselinuxjava: " + libPath);
+                System.load(libPath);
+
-                // set the debug & warn states appropriately
-                com.tresys.framework.compiler.Utility.SetDebug(debug);

trunk/test/test0001/test.sh

@@ -7 +7 @@
-RESULT=0
-
+# LIBSELINUX needs to be passed in as the full path to libselinuxjava.so
+
-#run the compiler test
-resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if
+framework-plugin/resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if -lib $LIBSELINUX
-
-#check compiler error result

trunk/test/test0002/test.sh

@@ -4 +4 @@
-
-RESULT=0
+# LIBSELINUX needs to be passed in as the full path to libselinuxjava.so
-
-#run the compiler test
-resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if
+framework-plugin/resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if -lib $LIBSELINUX
-
-#check compiler error result

trunk/test/test0003/test.sh

@@ -5 +5 @@
-RESULT=0
-
+# LIBSELINUX needs to be passed in as the full path to libselinuxjava.so
+
-#run the compiler test
-resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if
+framework-plugin/resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if -lib $LIBSELINUX
-
-#check compiler error result

trunk/test/test0004/test.sh

@@ -5 +5 @@
-RESULT=0
-
+# LIBSELINUX needs to be passed in as the full path to libselinuxjava.so
+
-#run the compiler test
-resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if
+framework-plugin/resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if -lib $LIBSELINUX
-
-#check compiler error result

trunk/test/test0005/test.sh

@@ -5 +5 @@
-RESULT=0
-
+# LIBSELINUX needs to be passed in as the full path to libselinuxjava.so
+
-#run the compiler test
-resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if
+framework-plugin/resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if -lib $LIBSELINUX
-
-#check compiler error result

trunk/test/test0006/test.sh

@@ -5 +5 @@
-RESULT=0
-
+# LIBSELINUX needs to be passed in as the full path to libselinuxjava.so
+
-#run the compiler test
-resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if
+framework-plugin/resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if -lib $LIBSELINUX
-
-#check compiler error result

trunk/test/test0007/test.sh

@@ -5 +5 @@
-RESULT=0
-
+# LIBSELINUX needs to be passed in as the full path to libselinuxjava.so
+
-#run the compiler test
-resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if
+framework-plugin/resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if -lib $LIBSELINUX
-
-#check compiler error result

trunk/test/test0008/test.sh

@@ -5 +5 @@
-RESULT=0
-
+# LIBSELINUX needs to be passed in as the full path to libselinuxjava.so
+
-#run the compiler test
-resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if
+framework-plugin/resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if -lib $LIBSELINUX
-
-#check compiler error result

trunk/test/test0009/test.sh

@@ -5 +5 @@
-RESULT=0
-
+# LIBSELINUX needs to be passed in as the full path to libselinuxjava.so
+
-#run the compiler test
-resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if
+framework-plugin/resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if -lib $LIBSELINUX
-
-#check compiler error result

trunk/test/test0010/test.sh

@@ -5 +5 @@
-RESULT=0
-
+# LIBSELINUX needs to be passed in as the full path to libselinuxjava.so
+
-#run the compiler test
-resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if
+framework-plugin/resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if -lib $LIBSELINUX
-
-#check compiler error result

trunk/test/test0011/test.sh

@@ -5 +5 @@
-RESULT=0
-
+# LIBSELINUX needs to be passed in as the full path to libselinuxjava.so
+
-#run the compiler test
-resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if
+framework-plugin/resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if -lib $LIBSELINUX
-
-#check compiler error result

trunk/test/test0012/test.sh

@@ -5 +5 @@
-RESULT=0
-
+# LIBSELINUX needs to be passed in as the full path to libselinuxjava.so
+
-#run the compiler test
-resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if
+framework-plugin/resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if -lib $LIBSELINUX
-
-#check compiler error result

trunk/test/test0013/test.sh

@@ -5 +5 @@
-RESULT=0
-
+# LIBSELINUX needs to be passed in as the full path to libselinuxjava.so
+
-#run the compiler test
-resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if
+framework-plugin/resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if -lib $LIBSELINUX
-
-#check compiler error result

trunk/test/test0014/test.sh

@@ -5 +5 @@
-RESULT=0
-
+# LIBSELINUX needs to be passed in as the full path to libselinuxjava.so
+
-#run the compiler test
-resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if
+framework-plugin/resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if -lib $LIBSELINUX
-
-#check compiler error result

trunk/test/test0015/test.sh

@@ -5 +5 @@
-RESULT=0
-
+# LIBSELINUX needs to be passed in as the full path to libselinuxjava.so
+
-#run the compiler test
-resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if
+framework-plugin/resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if -lib $LIBSELINUX
-
-#check compiler error result

trunk/test/test0016/test.sh

@@ -5 +5 @@
-RESULT=0
-
+# LIBSELINUX needs to be passed in as the full path to libselinuxjava.so
+
-#run the compiler test
-resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if
+framework-plugin/resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if -lib $LIBSELINUX
-
-#check compiler error result

trunk/test/test0017/test.sh

@@ -5 +5 @@
-RESULT=0
-
+# LIBSELINUX needs to be passed in as the full path to libselinuxjava.so
+
-#run the compiler test
-resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if
+framework-plugin/resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if -lib $LIBSELINUX
-
-#check compiler error result

trunk/test/test0018/test.sh

@@ -5 +5 @@
-RESULT=0
-
+# LIBSELINUX needs to be passed in as the full path to libselinuxjava.so
+
-#run the compiler test
-resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if
+framework-plugin/resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if -lib $LIBSELINUX
-
-#check compiler error result

trunk/test/test0019/test.sh

@@ -5 +5 @@
-RESULT=0
-
+# LIBSELINUX needs to be passed in as the full path to libselinuxjava.so
+
-#run the compiler test
-resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if
+framework-plugin/resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if -lib $LIBSELINUX
-
-#check compiler error result

trunk/test/test0020/test.sh

@@ -5 +5 @@
-RESULT=0
-
+# LIBSELINUX needs to be passed in as the full path to libselinuxjava.so
+
-#run the compiler test
-resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if
+framework-plugin/resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if -lib $LIBSELINUX
-
-#check compiler error result

trunk/test/test0021/test.sh

@@ -4 +4 @@
-
-RESULT=0
+# LIBSELINUX needs to be passed in as the full path to libselinuxjava.so
-
-#run the compiler test
-resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if
+framework-plugin/resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if -lib $LIBSELINUX
-
-#check compiler error result

trunk/test/test0022/test.sh

@@ -5 +5 @@
-RESULT=0
-
+# LIBSELINUX needs to be passed in as the full path to libselinuxjava.so
+
-#run the compiler test
-resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if
+framework-plugin/resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if -lib $LIBSELINUX
-
-#check compiler error result

trunk/test/test0023/test.sh

@@ -5 +5 @@
-RESULT=0
-
+# LIBSELINUX needs to be passed in as the full path to libselinuxjava.so
+
-#run the compiler test
-resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if
+framework-plugin/resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if -lib $LIBSELINUX
-
-#check compiler error result

trunk/test/test0024/test.sh

@@ -5 +5 @@
-RESULT=0
-
+# LIBSELINUX needs to be passed in as the full path to libselinuxjava.so
+
-#run the compiler test
-resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if
+framework-plugin/resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if -lib $LIBSELINUX
-
-#check compiler error result

trunk/test/test0025/test.sh

@@ -5 +5 @@
-RESULT=0
-
+# LIBSELINUX needs to be passed in as the full path to libselinuxjava.so
+
-#run the compiler test
-resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if
+framework-plugin/resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if -lib $LIBSELINUX
-
-#check compiler error result

trunk/test/test0026/test.sh

@@ -5 +5 @@
-RESULT=0
-
+# LIBSELINUX needs to be passed in as the full path to libselinuxjava.so
+
-#run the compiler test
-resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if
+framework-plugin/resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if -lib $LIBSELINUX
-
-#check compiler error result

trunk/test/test0027/test.sh

@@ -5 +5 @@
-RESULT=0
-
+# LIBSELINUX needs to be passed in as the full path to libselinuxjava.so
+
-#run the compiler test
-resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if
+framework-plugin/resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if -lib $LIBSELINUX
-
-#check compiler error result

trunk/test/test0028/test.sh

@@ -5 +5 @@
-RESULT=0
-
+# LIBSELINUX needs to be passed in as the full path to libselinuxjava.so
+
-#run the compiler test
-resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if
+framework-plugin/resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if -lib $LIBSELINUX
-
-#check compiler error result

trunk/test/test0029/test.sh

@@ -5 +5 @@
-RESULT=0
-
+# LIBSELINUX needs to be passed in as the full path to libselinuxjava.so
+
-#run the compiler test
-resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if
+framework-plugin/resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if -lib $LIBSELINUX
-
-#check compiler error result

trunk/test/test0030/test.sh

@@ -5 +5 @@
-RESULT=0
-
+# LIBSELINUX needs to be passed in as the full path to libselinuxjava.so
+
-#run the compiler test
-resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if
+framework-plugin/resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if -lib $LIBSELINUX
-
-#check compiler error result

trunk/test/test0031/test.sh

@@ -5 +5 @@
-RESULT=0
-
+# LIBSELINUX needs to be passed in as the full path to libselinuxjava.so
+
-#run the compiler test
-resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if
+framework-plugin/resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if -lib $LIBSELINUX
-
-#check compiler error result

trunk/test/test0032/test.sh

@@ -5 +5 @@
-RESULT=0
-
+# LIBSELINUX needs to be passed in as the full path to libselinuxjava.so
+
-#run the compiler test
-resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if
+framework-plugin/resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if -lib $LIBSELINUX
-
-#check compiler error result

trunk/test/test0033/test.sh

@@ -5 +5 @@
-RESULT=0
-
+# LIBSELINUX needs to be passed in as the full path to libselinuxjava.so
+
-#run the compiler test
-resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if
+framework-plugin/resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if -lib $LIBSELINUX
-
-#check compiler error result

trunk/test/test0034/test.sh

@@ -5 +5 @@
-RESULT=0
-
+# LIBSELINUX needs to be passed in as the full path to libselinuxjava.so
+
-#run the compiler test
-resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if
+framework-plugin/resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if -lib $LIBSELINUX
-
-#check compiler error result

trunk/test/test0035/test.sh

@@ -5 +5 @@
-RESULT=0
-
+# LIBSELINUX needs to be passed in as the full path to libselinuxjava.so
+
-#run the compiler test
-resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if
+framework-plugin/resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if -lib $LIBSELINUX
-
-#check compiler error result

trunk/test/test0036/test.sh

@@ -5 +5 @@
-RESULT=0
-
+# LIBSELINUX needs to be passed in as the full path to libselinuxjava.so
+
-#run the compiler test
-resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if
+framework-plugin/resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if -lib $LIBSELINUX
-
-#check compiler error result

trunk/test/test0037/test.sh

@@ -5 +5 @@
-RESULT=0
-
+# LIBSELINUX needs to be passed in as the full path to libselinuxjava.so
+
-#run the compiler test
-resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if
+framework-plugin/resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if -lib $LIBSELINUX
-
-#check compiler error result

trunk/test/test0038/test.sh

@@ -4 +4 @@
-
-RESULT=0
+# LIBSELINUX needs to be passed in as the full path to libselinuxjava.so
-
-#run the compiler test
-resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if
+framework-plugin/resources/dictionary/dictionary.fdic  -p $DIR/test.fpol -s $DIR/test.fsys -po $DIR/test.te -sf $DIR/test.fc -if $DIR/test.if -lib $LIBSELINUX
-
-#check compiler error result

trunk/test/test0039/test.sh

@@ -5 +5 @@
-RESULT=0
-