pwrtest01 modifications

project/pwrtest01/build_from_git.sh

@@ -89,16 +89,33 @@ echo "* Configure adm"
 export pwra_db=$pwre_broot/$os/$hw/bld/project/adm/db
 if [ ! -e $pwra_db ]; then
   mkdir -p $pwra_db
+  cp $pwre_croot/src/tools/pkg/deb/adm/* $pwra_db/
+fi
+if [ ! -e $pwra_db ]; then
+  mkdir -p $pwra_db
+  cp $pwre_croot/src/tools/pkg/deb/adm/* $pwra_db/
+fi
+if [ "`eval grep CVolPwrtest01 $pwra_db/pwr_volumelist.dat`" == "" ]; then
+  echo "CVolPwrtest01	0.0.254.254	pwrtest01" >> $pwra_db/pwr_volumelist.dat
+fi
+if [ "`eval grep VolPwrTest01a $pwra_db/pwr_volumelist.dat`" == "" ]; then
+  echo "VolPwrTest01a	0.254.254.201	pwrtest01" >> $pwra_db/pwr_volumelist.dat
+fi
+if [ "`eval grep VolPwrTest01b $pwra_db/pwr_volumelist.dat`" == "" ]; then
+  echo "VolPwrTest01b	0.254.254.202	pwrtest01" >> $pwra_db/pwr_volumelist.dat
+fi
+if [ "`eval grep VolPwrTest01c $pwra_db/pwr_volumelist.dat`" == "" ]; then
+  echo "VolPwrTest01c	0.254.254.203	pwrtest01" >> $pwra_db/pwr_volumelist.dat
+fi
+if [ "`eval grep VolPwrTest01d $pwra_db/pwr_volumelist.dat`" == "" ]; then
+  echo "VolPwrTest01d	0.254.254.204	pwrtest01" >> $pwra_db/pwr_volumelist.dat
+fi
+if [ ! -e $pwra_db/pwr_projectlist.dat ] || [ "`eval grep base $pwra_db/pwr_projectlist.dat`" == "" ]; then
+  echo "%base V0.0.0 $pwre_broot" > $pwra_db/pwr_projectlist.dat
+fi
+if [ "`eval grep pwrtest01 $pwra_db/pwr_projectlist.dat`" == "" ]; then
+  echo "pwrtest01	V0.0.0	$pwrp_root	Test-pwrtest01	\"\"" >> $pwra_db/pwr_projectlist.dat
 fi
-echo "pwra_db $pwra_db"
-cp $pwre_croot/src/tools/pkg/deb/adm/* $pwra_db/
-echo "CVolPwrtest01	0.0.254.254	pwrtest01" >> $pwra_db/pwr_volumelist.dat
-echo "VolPwrTest01a	0.254.254.201	pwrtest01" >> $pwra_db/pwr_volumelist.dat
-echo "VolPwrTest01b	0.254.254.202	pwrtest01" >> $pwra_db/pwr_volumelist.dat
-echo "VolPwrTest01c	0.254.254.203	pwrtest01" >> $pwra_db/pwr_volumelist.dat
-echo "VolPwrTest01d	0.254.254.204	pwrtest01" >> $pwra_db/pwr_volumelist.dat
-echo "%base V0.0.0 $pwre_broot" > $pwra_db/pwr_projectlist.dat
-echo "pwrtest01	V0.0.0	$pwrp_root	Test-pwrtest01	\"\"" >> $pwra_db/pwr_projectlist.dat
 
 source $pwra_db/pwr_setup.sh
 source $pwra_db/pwra_env.sh set project pwrtest01

project/pwrtest01/src/appl/ra_aproctest.cpp

@@ -76,7 +76,7 @@ ra_aproctest::ra_aproctest()
   pwr_tOid oid;
 
   m_anix = errh_eAnix_appl3;
-  m_log = new tst_log(&m_sts, "rt-Aproc", "$pwrp_log/aproc.log");
+  m_log = new tst_log(&m_sts, "rt-Aproc", "$pwrp_log/aproc.tlog");
   if (EVEN(m_sts))
     printf("** Unable to open log file");
   m_sts = gdh_Init("ra_aproctest");

project/pwrtest01/src/appl/ra_ccmtest.rtt_com

@@ -990,7 +990,7 @@ main()
   int log;
 
   verify(0);
-  log = tstlog_open("co-Ccm", "$pwrp_log/ccm.log");
+  log = tstlog_open("co-Ccm", "$pwrp_log/ccm.tlog");
 
   ccm_declarations(log);
   ccm_operators(log);

project/pwrtest01/src/appl/ra_cdhtest.cpp

@@ -1277,7 +1277,7 @@ void ra_cdhtest::AttrElemSize(void)
 // Constructor
 ra_cdhtest::ra_cdhtest()
 {
-  m_log = new tst_log(&m_sts, "co-Cdh", "$pwrp_log/cdh.log");
+  m_log = new tst_log(&m_sts, "co-Cdh", "$pwrp_log/cdh.tlog");
   if (EVEN(m_sts))
     printf("** Unable to open log file");
 }

project/pwrtest01/src/appl/ra_errhtest.cpp

@@ -561,7 +561,7 @@ ra_errhtest::ra_errhtest()
   pwr_tOid oid;
 
   m_anix = errh_eAnix_appl1;
-  m_log = new tst_log(&m_sts, "rt-Errh", "$pwrp_log/errh.log");
+  m_log = new tst_log(&m_sts, "rt-Errh", "$pwrp_log/errh.tlog");
   if (EVEN(m_sts))
     printf("** Unable to open log file");
   m_sts = gdh_Init("ra_errhtest");

project/pwrtest01/src/appl/ra_mhappltest.cpp

@@ -621,7 +621,7 @@ ra_mhappltest::ra_mhappltest() : m_clean(0), m_checkstatus(0), m_errcnt(0)
 {
   m_mh = this;
   m_clean = 1;
-  m_log = new tst_log(&m_sts, "rt-MhAppl", "$pwrp_log/mhappl.log");
+  m_log = new tst_log(&m_sts, "rt-MhAppl", "$pwrp_log/mhappl.tlog");
   if (EVEN(m_sts))
     printf("** Unable to open log file");
   m_sts = gdh_Init("ra_mhappltest");

project/pwrtest01/src/appl/ra_mhtest.cpp

@@ -525,7 +525,7 @@ ra_mhtest::ra_mhtest() : m_clean(0), m_checkstatus(0), m_errcnt(0)
 {
   m_mh = this;
   m_clean = 1;
-  m_log = new tst_log(&m_sts, "rt-Mh", "$pwrp_log/mh.log");
+  m_log = new tst_log(&m_sts, "rt-Mh", "$pwrp_log/mh.tlog");
   if (EVEN(m_sts))
     printf("** Unable to open log file");
   m_sts = gdh_Init("ra_mhtest");

project/pwrtest01/src/appl/ra_nettimetest.cpp

@@ -87,7 +87,7 @@ void ra_nettimetest::NetTimeToDeltaTime(void)
 // Constructor
 ra_nettimetest::ra_nettimetest()
 {
-  m_log = new tst_log(&m_sts, "rt-NetTime", "$pwrp_log/nettime.log");
+  m_log = new tst_log(&m_sts, "rt-NetTime", "$pwrp_log/nettime.tlog");
   if (EVEN(m_sts))
     printf("** Unable to open log file");
 }

project/pwrtest01/src/appl/ra_plctest.cpp

@@ -115,7 +115,7 @@ int main()
   unsigned int i;
   pwr_tAName aname;
 
-  tst_log *log = new tst_log(&sts, "rt-Plc", "$pwrp_log/plc.log");
+  tst_log *log = new tst_log(&sts, "rt-Plc", "$pwrp_log/plc.tlog");
   if (EVEN(sts))
     printf("** Unable to open log file");
 

project/pwrtest01/src/appl/ra_pwrrttest.py

@@ -1494,7 +1494,7 @@ class Ctx:
 
 
 ctx = Ctx()
-ctx.logger = pwrtest.logger('rt-pwrrt', '$pwrp_log/pwrrt.log')
+ctx.logger = pwrtest.logger('rt-pwrrt', '$pwrp_log/pwrrt.tlog')
 try:
     ctx.init()
 except:

project/pwrtest01/src/appl/ra_qcomtest.cpp

@@ -1414,7 +1414,7 @@ void ra_qcomtest::Request(void)
 // Constructor
 ra_qcomtest::ra_qcomtest()
 {
-  m_log = new tst_log(&m_sts, "rt-Qcom", "$pwrp_log/qcom.log");
+  m_log = new tst_log(&m_sts, "rt-Qcom", "$pwrp_log/qcom.tlog");
   if (EVEN(m_sts))
     printf("** Unable to open log file");
 }

project/pwrtest01/src/appl/ra_qmontest.cpp

@@ -488,9 +488,9 @@ ra_qmontest::ra_qmontest(eProc ptype) : m_ptype(ptype), m_qquota(500), m_errcnt(
   pwr_tVid vid;  
 
   if (isServer())
-    m_log = new tst_log(&m_sts, "rt-Qmon", "$pwrp_log/qmon.log");
+    m_log = new tst_log(&m_sts, "rt-Qmon", "$pwrp_log/qmon.tlog");
   else
-    m_log = new tst_log(&m_sts, "rt-QmonClient", "$pwrp_log/qmonc.log");
+    m_log = new tst_log(&m_sts, "rt-QmonClient", "$pwrp_log/qmonc.tlog");
   if (EVEN(m_sts))
     printf("** Unable to open log file");
 

project/pwrtest01/src/appl/ra_status.cpp

@@ -55,7 +55,7 @@ void ra_status::test_status()
 // Constructor
 ra_status::ra_status()
 {
-  m_log = new tst_log(&m_sts, "rt-Status", "$pwrp_log/tst_status.log");
+  m_log = new tst_log(&m_sts, "rt-Status", "$pwrp_log/tst_status.tlog");
   if (EVEN(m_sts))
     printf("** Unable to open log file");
 

project/pwrtest01/src/appl/ra_testall_c.sh

@@ -14,6 +14,7 @@ dexec()
 
 exec "ra_plctest"
 exec "ra_timetest"
+exec "ra_nettimetest"
 exec "ra_cdhtest"
 exec "ra_gdhtest"
 exec "ra_errhtest"

project/pwrtest01/src/appl/ra_timetest.cpp

@@ -1082,7 +1082,7 @@ void ra_timetest::GetTimeMonotonic(void)
 // Constructor
 ra_timetest::ra_timetest()
 {
-  m_log = new tst_log(&m_sts, "co-Time", "$pwrp_log/time.log");
+  m_log = new tst_log(&m_sts, "co-Time", "$pwrp_log/time.tlog");
   if (EVEN(m_sts))
     printf("** Unable to open log file");
 }

project/pwrtest01/src/appl/ra_xttscripttest.rtt_com

@@ -596,7 +596,7 @@ main()
 
   verify(0);
   tzset("Europe/Stockholm");
-  log = tstlog_open("op-XttScript", "$pwrp_log/xttscript.log");
+  log = tstlog_open("op-XttScript", "$pwrp_log/xttscript.tlog");
 
   ccm_CutObjectName(log);
   ccm_GetAttribute(log);

project/pwrtest01/src/login/login.sh

@@ -7,7 +7,7 @@
 
 export PWR_BUS_ID=999
 
-if [ -e "/data0/pwrp/tellus/login/sysinfo.txt" ]; then
+if [ -e "$pwrp_root/src/login/sysinfo.txt" ]; then
   echo "-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_"
   echo "Welcome to"
   echo "`$pwr_exe/pwrp_env.sh show project`"