Modified super-pi profile to support different sizes

[ppanula]

I did modify super-pi to support different calculation sizes for pi, 1, 2, 4, 8, 16 and 32 million digits.

Also changed universe-cli to calculate pi with 1 million digits.


diff --git a/pts/test-profiles/super-pi.xml b/pts/test-profiles/super-pi.xml
index 013f657..3767882 100644
--- a/pts/test-profiles/super-pi.xml
+++ b/pts/test-profiles/super-pi.xml
@@ -1,6 +1,6 @@
<PhoronixTestSuite>
<TestProfile>
- <Version>1.0.0</Version>
+ <Version>1.1.0</Version>
<TestType>Processor</TestType>
<SoftwareType>Utility</SoftwareType>
<License>UNKNOWN</License>
@@ -16,12 +16,39 @@
<TimesToRun>3</TimesToRun>
<ResultScale>Seconds</ResultScale>
<Proportion>LIB</Proportion>
- <Description>Time how long it takes to calculate pi to 1 million digits.</Description>
+ <Description>Time how long it takes to calculate pi.</Description>
<ExternalDependencies>build-utilities</ExternalDependencies>
</TestInformation>
<TestSettings>
- <Default>
- <Arguments>20</Arguments>
- </Default>
+ <Option>
+ <DisplayName>Digits to calculate</DisplayName>
+ <Identifier>digits</Identifier>
+ <Menu>
+ <Entry>
+ <Name>1 Million digits</Name>
+ <Value>20</Value>
+ </Entry>
+ <Entry>
+ <Name>2 Million digits</Name>
+ <Value>21</Value>
+ </Entry>
+ <Entry>
+ <Name>4 Million digits</Name>
+ <Value>22</Value>
+ </Entry>
+ <Entry>
+ <Name>8 Million digits</Name>
+ <Value>23</Value>
+ </Entry>
+ <Entry>
+ <Name>16 Million digits</Name>
+ <Value>24</Value>
+ </Entry>
+ <Entry>
+ <Name>32 Million digits</Name>
+ <Value>25</Value>
+ </Entry>
+ </Menu>
+ </Option>
</TestSettings>
</PhoronixTestSuite>
diff --git a/pts/test-suites/universe-cli.xml b/pts/test-suites/universe-cli.xml
index 5d2d7a9..6fe87f2 100644
--- a/pts/test-suites/universe-cli.xml
+++ b/pts/test-suites/universe-cli.xml
@@ -31,6 +31,8 @@
</RunTest>
<RunTest>
<Test>super-pi</Test>
+ <Arguments>20</Arguments>
+ <Description>1 Million digits</Description>
</RunTest>
<RunTest>
<Test>sqlite</Test>
--
1.5.4.3

[Michael]

In git, thanks Pekka.