From: Jakub Jelinek <jakub@redhat.com>
Date: Fri, 15 Oct 2021 21:39:27 +0000 (+0200)
Subject: openmp: Improve testsuite/libgomp.c/affinity-1.c testcase
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58cde8b7915d8c2c641c299cdab9d1002e7448f4;p=thirdparty%2Fgcc.git

openmp: Improve testsuite/libgomp.c/affinity-1.c testcase

I've noticed that while I have added hopefully sufficient test coverage
for the case where one uses simple number or !number as p-interval,
I haven't added any coverage for number:len:stride or number:len.

This patch adds that.

2021-10-15  Jakub Jelinek  <jakub@redhat.com>

	* testsuite/libgomp.c/affinity-1.c (struct places): Change name field
	type from char [50] to const char *.
	(places_array): Add a testcase for simplified syntax place followed
	by length or length and stride.

(cherry picked from commit a10794eafb151b9274d673dfae93459d437cbe4a)
---

diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp
index c149bc9a88b8..12291307b649 100644
--- a/libgomp/ChangeLog.omp
+++ b/libgomp/ChangeLog.omp
@@ -1,3 +1,13 @@
+2021-10-15  Tobias Burnus  <tobias@codesourcery.com>
+
+	Backported from master:
+	2021-10-15  Jakub Jelinek  <jakub@redhat.com>
+
+	* testsuite/libgomp.c/affinity-1.c (struct places): Change name field
+	type from char [50] to const char *.
+	(places_array): Add a testcase for simplified syntax place followed
+	by length or length and stride.
+
 2021-10-15  Tobias Burnus  <tobias@codesourcery.com>
 
 	Backported from master:
diff --git a/libgomp/testsuite/libgomp.c/affinity-1.c b/libgomp/testsuite/libgomp.c/affinity-1.c
index 1039e3b9c968..085526db6341 100644
--- a/libgomp/testsuite/libgomp.c/affinity-1.c
+++ b/libgomp/testsuite/libgomp.c/affinity-1.c
@@ -48,7 +48,7 @@ struct place
 };
 struct places
 {
-  char name[50];
+  const char *name;
   int count;
   struct place places[8];
 } places_array[] = {
@@ -63,7 +63,8 @@ struct places
       { 4, 1 }, { 5, 1 }, { 6, 1 }, { 7, 1 } } },
   { "{0,1},{3,2,4},{6,5,!6},{6},{7:2:-1,!6}", 5,
     { { 0, 2 }, { 2, 3 }, { 5, 1 }, { 6, 1 }, { 7, 1 } } },
-  { "1,2,{2,3,!2},3,3,!3,!{5:3:-1,!4,!5},{4},5,!4,!5", 3,
+  { "1,2,{2,3,!2},3,3,!3,!{5:3:-1,!4,!5},{4},5,!4,!5,"
+    "1:2,!{1},!2,7:3:-2,!{5},!7,!3", 3,
     { { 1, 1 }, { 2, 1 }, { 3, 1 } } }
 };