Author: mturk
Date: Fri Aug 28 10:54:14 2009
New Revision: 808846
URL: http://svn.apache.org/viewvc?rev=808846&view=rev
Log:
Move sample data to data dir
Added:
commons/sandbox/runtime/trunk/src/main/native/test/data/
commons/sandbox/runtime/trunk/src/main/native/test/data/sample.conf
- copied unchanged from r808506,
commons/sandbox/runtime/trunk/src/main/native/test/sample.conf
commons/sandbox/runtime/trunk/src/main/native/test/data/sample.ini
- copied unchanged from r808506,
commons/sandbox/runtime/trunk/src/main/native/test/sample.ini
commons/sandbox/runtime/trunk/src/main/native/test/data/sample.manifest
- copied unchanged from r808506,
commons/sandbox/runtime/trunk/src/main/native/test/sample.manifest
commons/sandbox/runtime/trunk/src/main/native/test/data/sample.properties
- copied unchanged from r808506,
commons/sandbox/runtime/trunk/src/main/native/test/sample.properties
Removed:
commons/sandbox/runtime/trunk/src/main/native/test/sample.conf
commons/sandbox/runtime/trunk/src/main/native/test/sample.ini
commons/sandbox/runtime/trunk/src/main/native/test/sample.manifest
commons/sandbox/runtime/trunk/src/main/native/test/sample.properties
Modified:
commons/sandbox/runtime/trunk/src/main/native/test/testsuite.c
Modified: commons/sandbox/runtime/trunk/src/main/native/test/testsuite.c
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/test/testsuite.c?rev=808846&r1=808845&r2=808846&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/test/testsuite.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/test/testsuite.c Fri Aug 28
10:54:14 2009
@@ -199,7 +199,7 @@
fflush(stderr);
return 3;
}
- options[0].optionString = (char *)jvmcp;
+ options[0].optionString = (char *)jvmcp;
vm_args.options = options;
vm_args.nOptions = 1;
vm_args.ignoreUnrecognized = JNI_TRUE;
@@ -242,8 +242,10 @@
char buf[1024];
ACR_GetErrorString(ACR_EFTYPE, buf, sizeof(buf));
- fprintf(stdout, "ACR_EFTYPE : %s\n", buf);
-
+ fprintf(stdout, "ACR_EFTYPE (%d) : %s\n", ACR_EFTYPE, buf);
+ ACR_SET_OS_ERROR(ACR_EFTYPE);
+ fprintf(stdout, "ACR_EFTYPE (%d) : %d errno=%d\n", ACR_EFTYPE,
+ ACR_GET_OS_ERROR(), errno);
fprintf(stdout, "errno: OK\n");
return 0;
}
@@ -278,7 +280,7 @@
top = ACR_IniLoadIni(NULL, argv[0]);
if (top) {
- dump_ini_node(ACR_IniNodeRoot(top), 0);
+ dump_ini_node(ACR_IniNodeRoot(top), 0);
ACR_IniFree(NULL, top);
}
printf("Ms INI OK\n");
@@ -301,7 +303,7 @@
ini = ACR_IniLoadProperties(NULL, argv[0], allowdups);
fprintf(stdout, "Using Property `%s\'\n", argv[0]);
- dump_ini_node(ACR_IniNodeRoot(ini), 0);
+ dump_ini_node(ACR_IniNodeRoot(ini), 0);
ACR_IniFree(NULL, ini);
return 0;
@@ -317,7 +319,7 @@
printf("Loaded OK %p\n", top);
if (top) {
- dump_ini_node(ACR_IniNodeRoot(top), 0);
+ dump_ini_node(ACR_IniNodeRoot(top), 0);
ACR_IniFree(NULL, top);
}
printf("Conf OK\n");
@@ -334,7 +336,7 @@
acr_ini_node_t *p;
top = ACR_IniNew(NULL);
-
+
ini = ACR_IniNodeSet(NULL, top, "node1", NULL);
ACR_IniSetCurrent(top, ini);
is1 = ACR_IniNodeSet(NULL, top, "node2", NULL);