epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

tests all pass now.

Browse Source
This commit is contained in:
Keenan Lang
2014-09-17 17:22:04 -05:00
parent 73b09f4976
commit 79cb473b6a
3 changed files with 4 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libCom/test/Makefile
View File

@@ -156,11 +156,6 @@ epicsExceptionTest_SRCS += epicsExceptionTest.cpp
testHarness_SRCS += epicsExceptionTest.cpp
TESTS += epicsExceptionTest
#TESTPROD_HOST += macEnvExpandTest
#macEnvExpandTest_SRCS += macEnvExpandTest.c
#testHarness_SRCS += macEnvExpandTest.c
#TESTS += macEnvExpandTest
TESTPROD_HOST += macDefExpandTest
macDefExpandTest_SRCS += macDefExpandTest.c
testHarness_SRCS += macDefExpandTest.c

6
src/libCom/test/macDefExpandTest.c
View File

@@ -120,9 +120,11 @@ static void check(const char *str, const char *macros, const char *expect)
{
MAC_HANDLE *handle;
char **defines;
static char *pairs[] = { "", "environ", NULL, NULL };
macCreateHandle(&handle, pairs);
macParseDefns(NULL, macros, &defines);
macCreateHandle(&handle, defines);
macInstallMacros(handle, defines);
char *got = macDefExpand(str, handle);
int pass = -1;
@@ -147,7 +149,7 @@ static void check(const char *str, const char *macros, const char *expect)
MAIN(macDefExpandTest)
{
eltc(0);
testPlan(71);
testPlan(97);
check("FOO", "", "FOO");

159
src/libCom/test/macEnvExpandTest.c
View File

@@ -1,159 +0,0 @@
/*************************************************************************\
* Copyright (c) 2006 UChicago Argonne LLC, as Operator of Argonne
* National Laboratory.
* Copyright (c) 2002 The Regents of the University of California, as
* Operator of Los Alamos National Laboratory.
* EPICS BASE is distributed subject to a Software License Agreement found
* in file LICENSE that is included with this distribution.
\*************************************************************************/
/*
* $Revision-Id$
*/
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include "macLib.h"
#include "envDefs.h"
#include "errlog.h"
#include "epicsUnitTest.h"
#include "testMain.h"
static void check(const char *str, const char *expect)
{
char *got = macEnvExpand(str);
int pass = -1;
if (expect && !got) {
testDiag("Got NULL, expected \"%s\".\n", expect);
pass = 0;
}
else if (!expect && got) {
testDiag("Got \"%s\", expected NULL.\n", got);
pass = 0;
}
else if (expect && got && strcmp(got, expect)) {
testDiag("Got \"%s\", expected \"%s\".\n", got, expect);
pass = 0;
}
testOk(pass, "%s", str);
}
MAIN(macEnvExpandTest)
{
eltc(0);
testPlan(71);
check("FOO", "FOO");
check("${FOO}", NULL);
check("${FOO,BAR}", NULL);
check("${FOO,BAR=baz}", NULL);
check("${FOO,BAR=$(FOO)}", NULL);
check("${FOO,FOO}", NULL);
check("${FOO,FOO=$(FOO)}", NULL);
check("${FOO,BAR=baz,FUM}", NULL);
check("${=}", "");
check("x${=}y", "xy");
check("${,=}", "");
check("x${,=}y", "xy");
check("${FOO=}", "");
check("x${FOO=}y", "xy");
check("${FOO=,}", "");
check("x${FOO=,}y", "xy");
check("${FOO,FOO=}", "");
check("x${FOO,FOO=}y", "xy");
check("${FOO=,BAR}", "");
check("x${FOO=,BAR}y", "xy");
check("${FOO=$(BAR=)}", "");
check("x${FOO=$(BAR=)}y", "xy");
check("${FOO=,BAR=baz}", "");
check("x${FOO=,BAR=baz}y", "xy");
check("${FOO=$(BAR),BAR=}", "");
check("x${FOO=$(BAR),BAR=}y", "xy");
check("${=BAR}", "BAR");
check("x${=BAR}y", "xBARy");
check("${FOO=BAR}", "BAR");
check("x${FOO=BAR}y", "xBARy");
epicsEnvSet("FOO","BLETCH");
check("${FOO}", "BLETCH");
check("${FOO,FOO}", "BLETCH");
check("x${FOO}y", "xBLETCHy");
check("x${FOO}y${FOO}z", "xBLETCHyBLETCHz");
check("${FOO=BAR}", "BLETCH");
check("x${FOO=BAR}y", "xBLETCHy");
check("${FOO=${BAZ}}", "BLETCH");
check("${FOO=${BAZ},BAR=$(BAZ)}", "BLETCH");
check("x${FOO=${BAZ}}y", "xBLETCHy");
check("x${FOO=${BAZ},BAR=$(BAZ)}y", "xBLETCHy");
check("${BAR=${FOO}}", "BLETCH");
check("x${BAR=${FOO}}y", "xBLETCHy");
check("w${BAR=x${FOO}y}z", "wxBLETCHyz");
check("${FOO,FOO=BAR}", "BAR");
check("x${FOO,FOO=BAR}y", "xBARy");
check("${BAR,BAR=$(FOO)}", "BLETCH");
check("x${BAR,BAR=$(FOO)}y", "xBLETCHy");
check("${BAR,BAR=$($(FOO)),BLETCH=GRIBBLE}", "GRIBBLE");
check("x${BAR,BAR=$($(FOO)),BLETCH=GRIBBLE}y", "xGRIBBLEy");
check("${$(BAR,BAR=$(FOO)),BLETCH=GRIBBLE}", "GRIBBLE");
check("x${$(BAR,BAR=$(FOO)),BLETCH=GRIBBLE}y", "xGRIBBLEy");
epicsEnvSet("BAR","GLEEP");
check("${FOO}/${BAR}", "BLETCH/GLEEP");
check("x${FOO}/${BAR}y", "xBLETCH/GLEEPy");
check("${FOO,BAR}/${BAR}", "BLETCH/GLEEP");
check("${FOO,BAR=x}/${BAR}", "BLETCH/GLEEP");
check("${BAZ=BLETCH,BAR}/${BAR}", "BLETCH/GLEEP");
check("${BAZ=BLETCH,BAR=x}/${BAR}", "BLETCH/GLEEP");
epicsEnvSet("BLETCH","BAR");
check("${${FOO}}", "BAR");
check("x${${FOO}}y", "xBARy");
check("${${FOO}=GRIBBLE}", "BAR");
check("x${${FOO}=GRIBBLE}y", "xBARy");
epicsEnvSet("BLETCH","${BAR}");
check("${${FOO}}", "GLEEP");
epicsEnvSet("FOO","${BAR}");
check("${FOO}","GLEEP");
epicsEnvSet("BAR","${BAZ}");
check("${FOO}", NULL);
epicsEnvSet("BAR","${BAZ=GRIBBLE}");
check("${FOO}", "GRIBBLE");
epicsEnvSet("BAR","${STR1}");
epicsEnvSet("STR1","VAL1");
epicsEnvSet("STR2","VAL2");
check("${FOO}", "VAL1");
epicsEnvSet("BAR","${STR2}");
check("${FOO}", "VAL2");
epicsEnvSet("BAR","${FOO}");
check("${FOO}", NULL);
check("${FOO,FOO=$(FOO)}", NULL);
check("${FOO=$(FOO)}", NULL);
check("${FOO=$(BAR),BAR=$(FOO)}", NULL);
errlogFlush();
eltc(1);
return testDone();
}