Skip to contentSkip to conversation

TestSupport: Break out target_getfile_something_stash

PATCH New Ian Jackson 1 participant 4 messages Sep 24, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 TestSupport: Break out target_getfile_something_stash

No functional change.

---
 Osstest/TestSupport.pm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
Osstest/TestSupport.pm +7 -3
index e554af38..896e275e 100644
@@ -565,13 +565,17 @@ sub target_getfile_root ($$$$) {
     my ($ho,$timeout, $rsrc,$ldst) = @_;
     tgetfileex('root', @_);
 }
-sub target_getfile_root_stash ($$$;$) {
-    my ($ho,$timeout,$rsrc, $lleaf) = @_; # => full path of local file
+sub target_getfile_something_stash ($$$$;$) {
+    my ($tgf,$ho,$timeout,$rsrc, $lleaf) = @_; # => full path of local file
     target_somefile_leaf(\$lleaf, $rsrc, $ho);
     open_unique_stashfile(\$lleaf); # discard filehandle, leave file
     my $lfile = "$stash/$lleaf";
-    target_getfile_root($ho,$timeout,$rsrc,$lfile);
+    $tgf->($ho,$timeout,$rsrc,$lfile);
     return $lfile;
+}    
+sub target_getfile_root_stash ($$$;$) {
+    my ($ho,$timeout,$rsrc, $lleaf) = @_; # => full path of local file
+    &target_getfile_something_stash(\&target_getfile_root, @_);
 }
 
 sub tputfileex {
Signature · 7 lines
2.11.0


_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
#1 lore raw

PATCH 2/4 TestSupport: Provide target_getfile_stash

No callers yet.

---
 Osstest/TestSupport.pm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
Osstest/TestSupport.pm +5 -1
index 896e275e..6937b65d 100644
@@ -61,7 +61,7 @@ BEGIN {
                       target_cmd_inputfh_root sshuho
                       target_getfile target_getfile_root
                       target_putfile target_putfile_root
-		      target_getfile_root_stash
+		      target_getfile_stash target_getfile_root_stash
                       target_putfilecontents_stash
 		      target_putfilecontents_root_stash
                       target_put_guest_image target_editfile
@@ -573,6 +573,10 @@ sub target_getfile_something_stash ($$$$;$) {
     $tgf->($ho,$timeout,$rsrc,$lfile);
     return $lfile;
 }    
+sub target_getfile_stash ($$$;$) {
+    my ($ho,$timeout,$rsrc, $lleaf) = @_; # => full path of local file
+    &target_getfile_something_stash(\&target_getfile, @_);
+}
 sub target_getfile_root_stash ($$$;$) {
     my ($ho,$timeout,$rsrc, $lleaf) = @_; # => full path of local file
     &target_getfile_something_stash(\&target_getfile_root, @_);
Signature · 7 lines
2.11.0


_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
#2 lore raw

PATCH 3/4 ts-*-build: Save the .config (as <host>--kconfig)

In reply to Ian Jackson

This is saved after the build but we want it even if there is a build failure, so save it after it is generated and before we start the build.

---
 ts-kernel-build | 1 +
 ts-xen-build    | 2 ++
 2 files changed, 3 insertions(+)
ts-kernel-build +1 -0
index 5536586f..56ff7994 100755
@@ -404,6 +404,7 @@ sub config () {
     my $confighow= $r{kconfighow};
     $confighow =~ s/\W/_/g;
     &{ "config_$confighow" }();
+    target_getfile_stash($ho,30,"$builddir/linux/.config","kconfig");
 }
 
 sub build () {
ts-xen-build +2 -0
index 1762cd61..deec52b2 100755
@@ -166,6 +166,8 @@ END
             fi
 END
 
+    target_getfile_stash($ho,30, "$builddir/xen/.config","kconfig");
+
     if (!@make_args) {
 	buildcmd_stamped_logged(9000, 'xen', 'build', '',<<END,'');
             $make_prefix $make $makeflags build
Signature · 7 lines
2.11.0


_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
#3 lore raw

PATCH 4/4 ts-kernel-build: Actually disable CONFIG_ARCH_QCOM

In reply to Ian Jackson

osstest c/s efeddf7eca86
ts-kernel-build: Disable CONFIG_ARCH_QCOM in Xen Project CI
did not work because it lacked the needed `setopt'. Oops.

---
 ts-kernel-build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
ts-kernel-build +1 -1
index 56ff7994..c976289e 100755
@@ -276,7 +276,7 @@ setopt CONFIG_SPI_THUNDERX=m
 
 # Some Linux branches we care about, including 4.19, still lack
 # firmware: qcom_scm: Use proper types for dma mappings
-CONFIG_ARCH_QCOM=n
+setopt CONFIG_ARCH_QCOM=n
 
 ####
 
Signature · 7 lines
2.11.0


_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel