origen_std_lib 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90e033ed9a86e3be90b87659b9c9e5dc7f861240
-  data.tar.gz: b24eb49d30dba303bf7660150872b8a7a82269ff
+  metadata.gz: eadbc4a0b2fcc29034f683af9e445734b77c33a0
+  data.tar.gz: 44f4f6b42699e19027062da331d333a22a289b1a
 SHA512:
-  metadata.gz: ebca35973aa2876aa8d8d9586958ea342d305e2c963aa0948afb62dfaf64160937b514e01bca3bf1716705ceb953af207bff30935337b4a8cde3ed46ef89e05e
-  data.tar.gz: 4f134a1d9a9013d8217b93bae014dd4f42e34b9729b9c6ca6f7493f54db7246d56b54e4c4729f9bfe91ed7efbbac7d0b577acb7cd6075de4e0fd17c459f5ca60
+  metadata.gz: 01ed8d65d50cd94b129f3c81428fe564d65b53ca17463a5f9eec024d7f9890cb386b2673f2dc1cb107ee01079271aab54579bb90d7b4746e522ec1ab34774ba1
+  data.tar.gz: 5542819ce7d70fb88193e112a2c9854ae5112e10cb7b3547feed65844c6eb80d9deda49c4e94df37a3bf48ea33f940703233efb8fb589eb19dd50374c37598ab

data/config/version.rb

@@ -1,6 +1,6 @@
 module OrigenStdLib
   MAJOR = 0
-  MINOR = 9
+  MINOR = 10
   BUGFIX = 0
   DEV = nil
 

data/stdlib/v93k/origen/origen.hpp

@@ -1,7 +1,7 @@
 #ifndef ORIGEN_HPP_INCLUDED
 #define ORIGEN_HPP_INCLUDED
 
-#define ORIGEN_VERSION "0.9.0"
+#define ORIGEN_VERSION "0.10.0"
 
 #ifndef debugger
 #define debugger __asm__("int $3");

data/stdlib/v93k/origen/origen/test_method/dc_measurement.cpp

@@ -154,14 +154,14 @@ void DCMeasurement::execute() {
 void DCMeasurement::serialProcessing(int site) {
 	if (_processResults) {
 	    logFunctionalTest(testSuiteName, site, funcResultsPre[site] == 1, label);
-		TESTSET().testnumber(testnumber()).cont(true).judgeAndLog_FunctionalTest(funcResultsPre[site] == 1);
+		TESTSET().testnumber(testnumber()).cont(true).testname(testSuiteName + "_PRE").judgeAndLog_FunctionalTest(funcResultsPre[site] == 1);
 
 		logParametricTest(testSuiteName, site, filterResult(results[site]), limits(), _pin);
 		TESTSET().testnumber(testnumber() + 1).judgeAndLog_ParametricTest(_pin, testSuiteName, limits(), filterResult(results[site]));
 
         if (_applyShutdown && _checkShutdown) {
             logFunctionalTest(testSuiteName, site, funcResultsPost[site] == 1, _shutdownPattern);
-            TESTSET().testnumber(testnumber() + 1).cont(true).judgeAndLog_FunctionalTest(funcResultsPost[site] == 1);
+            TESTSET().testnumber(testnumber() + 2).cont(true).testname(testSuiteName + "_POST").judgeAndLog_FunctionalTest(funcResultsPost[site] == 1);
         }
 	}
 }

data/stdlib/v93k/origen/origen/test_method/frequency_measurement.cpp

@@ -77,7 +77,7 @@ void FrequencyMeasurement::serialProcessing(int site) {
 			result = calculateFrequency(captureData, _periodInNs);
 		}
 		logFunctionalTest(testSuiteName, site, funcResults[site] == 1, label);
-		TESTSET().testnumber(testnumber()).judgeAndLog_FunctionalTest(funcResults[site] == 1);
+		TESTSET().testnumber(testnumber()).testname(testSuiteName).judgeAndLog_FunctionalTest(funcResults[site] == 1);
 
 		logParametricTest(testSuiteName, site, filterResult(result), limits(), _pin);
 		TESTSET().testnumber(testnumber() + 1).judgeAndLog_ParametricTest(_pin, testSuiteName, limits(), filterResult(result));

data/stdlib/v93k/origen/origen/test_method/functional_test.cpp

@@ -11,6 +11,7 @@ FunctionalTest::FunctionalTest() {
     capture(0);
     processResults(1);
     bitPerWord(1);
+    pattern("");
 }
 
 FunctionalTest::~FunctionalTest() { }
@@ -23,6 +24,8 @@ FunctionalTest & FunctionalTest::pin(string v) { _pin = v; return *this; }
 FunctionalTest & FunctionalTest::bitPerWord(int v) { _bitPerWord = v; return *this; }
 /// When set to 0 the results of the test will not be judged or logged
 FunctionalTest & FunctionalTest::processResults(int v) { _processResults = v; return *this; }
+/// Override the pattern argument from the test suite
+FunctionalTest & FunctionalTest::pattern(string v) { _pattern = v; return *this; }
 
 // All test methods must implement this function
 FunctionalTest & FunctionalTest::getThis() { return *this; }
@@ -41,7 +44,11 @@ void FunctionalTest::execute() {
     GET_TESTSUITE_NAME(testSuiteName);
 //    testSuiteName = testSuiteName + toStr(CURRENT_SITE_NUMBER());
 //    cout << testSuiteName << endl;
-    label = Primary.getLabel();
+    if (_pattern == "") {
+    	label = Primary.getLabel();
+    } else {
+    	label = _pattern;
+    }
 
     if (_capture) {
         pinName = extractPinsFromGroup(_pin);
@@ -100,7 +107,7 @@ void FunctionalTest::serialProcessing(int site) {
 	if (_processResults) {
 //		cout << "POST " << site << ": " << results[site] << endl;
 	    logFunctionalTest(testSuiteName, site, results[site] == 1, label);
-	    TESTSET().testnumber(testnumber()).judgeAndLog_FunctionalTest(results[site] == 1);
+	    TESTSET().testnumber(testnumber()).testname(testSuiteName).judgeAndLog_FunctionalTest(results[site] == 1);
 	}
 }
 

data/stdlib/v93k/origen/origen/test_method/functional_test.hpp

@@ -17,6 +17,7 @@ class FunctionalTest: public Base  {
     int _capture;
     int _bitPerWord;
     int _processResults;
+    string _pattern;
 
 public:
     FunctionalTest();
@@ -29,7 +30,7 @@ public:
     FunctionalTest & pin(string v);
     FunctionalTest & bitPerWord(int v);
     FunctionalTest & processResults(int v);
-
+    FunctionalTest & pattern(string v);
 
 protected:
     FunctionalTest & getThis();

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_std_lib
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-10 00:00:00.000000000 Z
+date: 2017-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen