[smolder] swap sha1 & git_describe

fernandobrito · Nov 22, 2010 · fea9faa · fea9faa
1 parent 73ceeb1
commit fea9faa
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/lib/Parrot/Harness/Smoke.pm b/lib/Parrot/Harness/Smoke.pm
@@ -131,7 +131,7 @@ sub send_archive_to_smolder {
             password     => $SMOLDER_CONFIG{password},
             tags         => $tags,
             report_file  => $report_file,
-            revision     => $PConfig{sha1},
+            revision     => $PConfig{git_describe},
         ]
     );
 
@@ -199,8 +199,8 @@ sub collect_test_environment_data {
     push @data, ( 'Configure args' => $PConfig{configure_args} )
       if $PConfig{configure_args};
     push @data, ( 'Modifications' => join(" ", @mods) ) if @mods;
-    push @data, ( 'Git describe' => $PConfig{git_describe} )
-      if $PConfig{git_describe};
+    push @data, ( 'Git sha1' => $PConfig{sha1} )
+      if $PConfig{sha1};
     return @data;
 }
 

diff --git a/t/harness.pir b/t/harness.pir
@@ -217,11 +217,11 @@ TEST
     .local string submitter
     submitter = _get_submitter(config, env)
     $P0['Submitter'] = submitter
-    $I0 = exists config['git_describe']
+    $I0 = exists config['sha1']
     unless $I0 goto L2
-    .local string git_describe
-    git_describe = config['git_describe']
-    $P0['Git describe'] = git_describe
+    .local string sha1
+    sha1 = config['sha1']
+    $P0['Git sha1'] = sha1
   L2:
     _add_git_info($P0)
     .return ($P0)
@@ -350,10 +350,10 @@ TEST
     push contents, 'Platform'
     $S0 = config['osname']
     push contents, $S0
-    $I0 = exists config['sha1']
+    $I0 = exists config['git_describe']
     unless $I0 goto L0
     push contents, 'revision'
-    $S0 = config['sha1']
+    $S0 = config['git_describe']
     push contents, $S0
   L0:
     push contents, 'tags'