Blast 1.1 release (windows / linux)

see docs/release_notes.txt for details

1 files changed, 36 insertions, 7 deletions

diff --git a/test/src/unit/SyncTests.cpp b/test/src/unit/SyncTests.cpp
index 425210d..4ac79ac 100644
--- a/test/src/unit/SyncTests.cpp
+++ b/test/src/unit/SyncTests.cpp
@@ -1,3 +1,31 @@
+// This code contains NVIDIA Confidential Information and is disclosed to you
+// under a form of NVIDIA software license agreement provided separately to you.
+//
+// Notice
+// NVIDIA Corporation and its licensors retain all intellectual property and
+// proprietary rights in and to this software and related documentation and
+// any modifications thereto. Any use, reproduction, disclosure, or
+// distribution of this software and related documentation without an express
+// license agreement from NVIDIA Corporation is strictly prohibited.
+//
+// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES
+// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO
+// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,
+// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
+//
+// Information and code furnished is believed to be accurate and reliable.
+// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such
+// information or for any infringement of patents or other rights of third parties that may
+// result from its use. No license is granted by implication or otherwise under any patent
+// or patent rights of NVIDIA Corporation. Details are subject to change without notice.
+// This code supersedes and replaces all information previously supplied.
+// NVIDIA Corporation products are not authorized for use as critical
+// components in life support devices or systems without express written approval of
+// NVIDIA Corporation.
+//
+// Copyright (c) 2016-2017 NVIDIA Corporation. All rights reserved.
+
+
 #include "TkBaseTest.h"
 
 #include "NvBlastExtSync.h"
@@ -26,7 +54,7 @@ public:
 		TkFramework* fwk = NvBlastTkFrameworkGet();
 
 		TkGroupDesc gdesc;
-		gdesc.pxTaskManager = m_test->m_taskman;
+		gdesc.workerCount = m_test->m_taskman->getCpuDispatcher()->getWorkerCount();
 		m_group = fwk->createGroup(gdesc);
 		EXPECT_TRUE(m_group != nullptr);
 
@@ -48,6 +76,7 @@ public:
 		families[1]->setID(id);
 		m_group->addActor(*actor1);
 
+		m_test->m_groupTM->setGroup(m_group);
 
 		//////// server/client specific impl ////////
 
@@ -121,8 +150,8 @@ protected:
 		}
 
 		// process
-		m_group->process();
-		m_group->sync();
+		m_test->m_groupTM->process();
+		m_test->m_groupTM->wait();
 		EXPECT_EQ(families[0]->getActorCount(), 2);
 
 		// sync family #0
@@ -149,8 +178,8 @@ protected:
 		}
 
 		// process
-		m_group->process();
-		m_group->sync();
+		m_test->m_groupTM->process();
+		m_test->m_groupTM->wait();
 		EXPECT_EQ(families[0]->getActorCount(), 5);
 		EXPECT_EQ(families[1]->getActorCount(), 1);
 
@@ -229,8 +258,8 @@ protected:
 			family->removeListener(*this);
 		}
 
-		m_group->process();
-		m_group->sync();
+		m_test->m_groupTM->process();
+		m_test->m_groupTM->wait();
 
 		sync->release();
 	}